Changeset 9032

Timestamp:

Sep 2, 2009, 3:26:34 PM (13 years ago)

Author:

charles

Message:

(trunk, libT) fix code in the UTF8-to-JSON serializer that could fall into an infinite loop when fed some inputs. This may be ticket #2326 or may get its own retroactive ticket, depending on feedback from #2326's reporter

File:

• trunk/libtransmission/bencode.c (modified) (1 diff)

trunk/libtransmission/bencode.c

@@ -1340 +1340 @@
                     UTF32 *      u32 = &buf;
                     ConversionResult result = ConvertUTF8toUTF32( &tmp, end, &u32, &buf + 1, 0 );
-                    if( ( result != conversionOK ) && ( tmp == it ) )
-                        ++it; /* it's beyond help; skip it */
-                    else {
+                    if((( result==conversionOK ) || (result==targetExhausted)) && (tmp!=it)) {
                         evbuffer_add_printf( data->out, "\\u%04x", (unsigned int)buf );
                         it = tmp - 1;