Changeset 12463

Timestamp:

May 27, 2011, 11:28:40 PM (10 years ago)

Author:

jordan

Message:

(trunk libT) #4284 "crash via webfrontend or transmission-remote" -- use patch from jerwied

File:

• trunk/libtransmission/bencode.c (modified) (2 diffs)

trunk/libtransmission/bencode.c

@@ -1266 +1266 @@
 jsonChildFunc( struct jsonWalk * data )
 {
-    if( data->parents )
+    if( data->parents && data->parents->data )
     {
         struct ParentState * parentState = data->parents->data;
@@ -1373 +1373 @@
     const unsigned char * it = (const unsigned char *) getStr(val);
     const unsigned char * end = it + val->val.s.len;
-    const int safeguard = 512; /* arbitrary margin for escapes and unicode */
-
-    evbuffer_reserve_space( data->out, val->val.s.len+safeguard, vec, 1 );
+
+    evbuffer_reserve_space( data->out, val->val.s.len * 4, vec, 1 );
     out = vec[0].iov_base;
     outend = out + vec[0].iov_len;