Changeset 0eec386

Timestamp:

2006-05-18T16:41:18Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

41e5202

Parents:

266fe2f

Message:

Added a body_size attribute to http_client and fixed a possible NULL
dereference bug.

Location:

protocols

Files:

• http_client.c (modified) (1 diff)
• http_client.h (modified) (1 diff)

protocols/http_client.c

@@ -253 +253 @@
                 evil_server = 1;
         }
-        else
+        else if( end1 )
         {
                 end1 += 2;
         }
-        
-        if( end1 )
-        {
-                *end1 = 0;
-                
-                if( evil_server )
-                        req->reply_body = end1 + 1;
-                else
-                        req->reply_body = end1 + 2;
-        }
+        else
+        {
+                goto cleanup;
+        }
+        
+        *end1 = 0;
+        
+        if( evil_server )
+                req->reply_body = end1 + 1;
+        else
+                req->reply_body = end1 + 2;
+        
+        req->body_size = req->reply_headers + bytes_read - req->reply_body;
         
         if( ( end1 = strchr( req->reply_headers, ' ' ) ) != NULL )

protocols/http_client.h

@@ -39 +39 @@
         char *reply_headers;
         char *reply_body;
+        int body_size;
         int finished;