Changeset 24324

Timestamp:

10/15/13 13:00:37 (9 years ago)

Author:

nit

Message:

[titan] fix possible memleak

File:

• titan/titan/global.h (modified) (4 diffs)

titan/titan/global.h

@@ -3255 +3255 @@
         stream.avail_in = inlen;
         stream.next_in = (void*)inbuf;
-
+  
         do
         {
@@ -3268 +3268 @@
                         return 1;
                 }
-
         }
         while(stream.avail_out == 0);
+        
+        char* tmpoutbuf = *outbuf;      
         *outlen = inlen - stream.avail_out;
         *outbuf = realloc(*outbuf, *outlen);
+        if(*outbuf == NULL) free(tmpoutbuf);    
 
         (void)deflateEnd(&stream);
@@ -3323 +3325 @@
         stream.next_in = (void*)inbuf;
 
+        int round = 0;
         do
         {
                 stream.avail_out = maxbuf;
-                stream.next_out = (void*)*outbuf;
+                
+                if(flag == 0 && round > 0)
+                {
+                        char* tmpoutbuf = *outbuf;
+                        *outbuf = realloc(*outbuf, maxbuf * (round + 1));
+                        if(*outbuf == NULL)
+                        {
+                                free(tmpoutbuf);
+                                (void)inflateEnd(&stream);
+                                return 1;
+                        }
+                        stream.next_out = (void*)(*outbuf) + maxbuf * round;
+                }
+                else
+                        stream.next_out = (void*)*outbuf;
 
                 ret = inflate(&stream, Z_NO_FLUSH);
@@ -3340 +3357 @@
                 }
 
+                round++;
         }
         while(stream.avail_out == 0);
-        *outlen = maxbuf - stream.avail_out;
-        if(flag == 0) *outbuf = realloc(*outbuf, *outlen);
+        
+        if(flag == 0)
+        {
+                char* tmpoutbuf = *outbuf;
+                *outlen = (maxbuf * round) - stream.avail_out;
+                *outbuf = realloc(*outbuf, *outlen);
+                if(*outbuf == NULL) free(tmpoutbuf);    
+        }
+        else
+                *outlen = maxbuf - stream.avail_out;                    
 
         (void)inflateEnd(&stream);