pidgin.2.5.6: 61ece5c7: Backport 7829ec76bdb008583f8da54e238c226...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 61ece5c7356237996290e900dd37c32a4dd81d3e
Ancestor: 6e22a23609a6e1167ffbafeb34a526db3f9a6b3b
Author: datallah at pidgin.im
Date: 2009-04-30T05:19:41
Branch: im.pidgin.pidgin.2.5.6
URL: http://d.pidgin.im/viewmtn/revision/info/61ece5c7356237996290e900dd37c32a4dd81d3e

Modified files:
        COPYRIGHT libpurple/circbuffer.c

ChangeLog: 

Backport 7829ec76bdb008583f8da54e238c2265a1140db2 (#8706 - Corruption in PurpleCircBuffer)

-------------- next part --------------
============================================================
--- COPYRIGHT	cfc347136954fa613bb9ec380eb31acf7b65067f
+++ COPYRIGHT	367b63e9a12eca980e28cea0f3878843ba96f8c3
@@ -8,6 +8,7 @@ Matt Amato
 Dave Ahlswede
 Manuel Amador
 Matt Amato
+Josef Andrysek
 Geoffrey Antos
 Daniel Atallah
 Paul Aurich
============================================================
--- libpurple/circbuffer.c	314ec304e2d7408dd5633044098f87925819d044
+++ libpurple/circbuffer.c	2198449fa6cbda6c614533b5ea50619fad33fa3d
@@ -68,7 +68,8 @@ static void grow_circ_buffer(PurpleCircB
 
 	/* If the fill pointer is wrapped to before the remove
 	 * pointer, we need to shift the data */
-	if (in_offset < out_offset) {
+	if (in_offset < out_offset
+			|| (in_offset == out_offset && buf->bufused > 0)) {
 		int shift_n = MIN(buf->buflen - start_buflen,
 			in_offset);
 		memcpy(buf->buffer + start_buflen, buf->buffer,