Changeset 34 in cheroxy for trunk/src/CRXProxy.cpp

Timestamp:

11/20/12 16:31:22 (11 years ago)

Author:

cheese

Message:

#1 fix crash bug for memcpy on getting request/response message from CRXProxy

File:

• trunk/src/CRXProxy.cpp (modified) (4 diffs)

trunk/src/CRXProxy.cpp

@@ -141 +141 @@
                           const int aBufferSize) const
 {
-    void * aPtr = static_cast<void *> (aBuffer);
+    void        * aPtr = static_cast<void *> (aBuffer);
+
+    int         aCopyLength     = 0;
+    int         aRemainLength   = aBufferSize;
+    const int   aHeaderLength   = mHttpRequest.GetHeader ().length ();
 
     /*----------------------------------------------------------------*/
@@ -147 +151 @@
         return NULL;
     
-    if (aBufferSize > 0)
-        memcpy (aPtr, mHttpRequest.GetHeader ().c_str (), aBufferSize);
+    aCopyLength = aRemainLength < aHeaderLength ? aBufferSize : aHeaderLength;
+    if (aCopyLength > 0)
+        memcpy (aPtr, mHttpRequest.GetHeader ().c_str (), aCopyLength);
     /*----------------------------------------------------------------*/
 
@@ -175 +180 @@
                            const int    aBufferSize) const
 {
-    void    * aPtr = static_cast<void *> (aBuffer);
-
-    int     aRemainLength = aBufferSize;
+    void        * aPtr = static_cast<void *> (aBuffer);
+
+    int         aCopyLength     = 0;
+    int         aRemainLength   = aBufferSize;
+    const int   aHeaderLength   = mHttpResponse.GetHeader ().length ();
+    const int   aContentLength  = mHttpResponse.GetContentLength ();
 
     /*----------------------------------------------------------------*/
@@ -183 +191 @@
         return NULL;
 
-    if (aRemainLength > 0)
-        memcpy (aPtr, mHttpResponse.GetHeader ().c_str (), aRemainLength);
-
-    aRemainLength -= mHttpResponse.GetHeader ().length ();
-
-    if (aRemainLength > 0)
-        memcpy (aPtr, mHttpResponse.GetContentBody (), aRemainLength);
+    aCopyLength = aRemainLength < aHeaderLength ? aBufferSize : aHeaderLength;
+    if (aCopyLength > 0)
+        memcpy (aPtr, mHttpResponse.GetHeader ().c_str (), aCopyLength);
+
+    aRemainLength -= aCopyLength;
+
+    aCopyLength = aRemainLength < aContentLength ? aRemainLength : aContentLength;
+    if (aCopyLength > 0)
+        memcpy (aPtr, mHttpResponse.GetContentBody (), aCopyLength);
     /*----------------------------------------------------------------*/