Changeset 24304 for titan/titan/sock.h

Timestamp:

10/14/13 15:33:40 (10 years ago)

Author:

nit

Message:

[titan] fix segfault

File:

• titan/titan/sock.h (modified) (13 diffs)

titan/titan/sock.h

@@ -587 +587 @@
 unsigned long getchunkedlen(int sock, int timeout)
 {
-printf("1111111111\n");
         unsigned long len = 0;
         int ret = 0;
@@ -603 +602 @@
                         break;
                 }
-printf("222222222\n");
                 if(c == ';') break;
 
                 chunked[chunkedid] = c;
-printf("333333333\n");
                 chunkedid++;
                 if(chunkedid > 2 && c == '\n')
                         break;
         }
-printf("8888888\n");
+
         len = strtol(chunked, NULL, 16);
-printf("999999999\n");
         debug(99, "chunkedlen=%u", len); 
         return len;
@@ -625 +621 @@
 {
         int sock = -1, ret = 0, count = 0, hret = 0, freeheader = 0, gzip = 0;
-        int headerlen = 0, chunkedlen = 0, chunked = 0;
+        int headerlen = 0, chunkedlen = 0, chunked = 0, readsize = 0;
         unsigned int len = 0, maxret = 0;
         char *ip = NULL;
@@ -734 +730 @@
                 pbuf++;
         }
+        
+        debug(99, "-----------------------------------------------------------------"); 
+        debug(99, "header: %s", tmpbuf);
+        debug(99, "-----------------------------------------------------------------");
 
         if(flag == 2)
@@ -752 +752 @@
                 goto end;
         }
+        
+        if(flag == 0) headerlen = 0;
 
         //TODO: case-sens check
@@ -760 +762 @@
                 len = strtoul(contentlen, NULL, 10);
         }
-
-        debug(99, "-----------------------------------------------------------------"); 
-        debug(99, "header: %s", tmpbuf);
-        debug(99, "-----------------------------------------------------------------");
         
         if(filename == NULL && (flag == 0 || flag == 1) && ostrstr(tmpbuf, "gzip") != NULL)
@@ -774 +772 @@
                 chunked = 1; 
                 chunkedlen = getchunkedlen(sock, timeout);
-                if(chunkedlen > MINMALLOC) chunked = 0;
-        }
-
-        if(flag == 0) headerlen = 0;
-        if(chunked == 0) chunkedlen = MINMALLOC - headerlen;
-        while((ret = sockread(sock, (unsigned char*)tmpbuf + headerlen, 0, chunkedlen, timeout * 1000, 0)) > 0)
-        {
+                if(chunkedlen + headerlen > MINMALLOC)
+                        readsize = MINMALLOC - headerlen;
+                else
+                        readsize = chunkedlen;
+        }
+
+        if(chunked == 0) readsize = MINMALLOC - headerlen;
+        while((ret = sockread(sock, (unsigned char*)tmpbuf + headerlen, 0, readsize, timeout * 1000, 0)) > 0)
+        {
+                if(chunked == 1) chunkedlen -= ret;
+
                 maxret += ret;
                 if(len > 0)
@@ -804 +806 @@
                 memset(tmpbuf, 0, ret);
                 
-                if(chunked == 1)
+                if(chunked == 1 && chunkedlen == 0)
                 {
                         chunkedlen = getchunkedlen(sock, timeout);
-                        if(chunkedlen > MINMALLOC) chunked = 0;
-                }
-                if(chunked == 0) chunkedlen = MINMALLOC - headerlen;
+                        if(chunkedlen + headerlen > MINMALLOC)
+                                readsize = MINMALLOC - headerlen;
+                        else
+                                readsize = chunkedlen;
+                }
+                if(chunked == 1 && chunkedlen > 0)
+                {
+                        if(chunkedlen + headerlen > MINMALLOC)
+                                readsize = MINMALLOC - headerlen;
+                        else
+                                readsize = chunkedlen;
+                }
+                if(chunked == 0) readsize = MINMALLOC - headerlen;
         }
         if(ret < 0)
@@ -828 +840 @@
 
 end:
-printf("aaaaaaaa\n");
+
         free(tmpbuf);
         if(fd != NULL) fclose(fd);
         sockclose(&sock);
-printf("bbbbbb\n");     
+
         if(gzip != 0)
         {
@@ -872 +884 @@
                 debug(99, "http unzip end");
         }
-printf("ccccccccc\n");
+
         if(filename == NULL)
         {
@@ -878 +890 @@
                 buf[count] = '\0';
         }
-printf("ddddddddd\n");
+
         if((hret == 301 || hret == 302) && retstr != NULL && redirect < 3) //redirect
         {
@@ -901 +913 @@
                         }
                 }
-printf("eeeeeeeee\n");
+
                 redirect++;
                 free(buf); buf = NULL;
@@ -907 +919 @@
                 free(rhost); rhost = NULL;
         }
-printf("ffffffff\n");
+
         if(clen != 0) *clen = maxret;
         if(dnode != NULL) dnode->ret = 0;
         free(retstr); retstr = NULL;
-printf("ggggggggggg\n");
+
         if(filename == NULL)
                 return buf;