Changeset 7544 for trunk/src

Timestamp:

Dec 4, 2001, 8:53:19 PM (24 years ago)

Author:

sandervl

Message:

strlen crashes on NULL strings

File:

• trunk/src/wininet/http.c (modified) (2 diffs)

trunk/src/wininet/http.c

@@ -637 +637 @@
             if (lpwhr->pCustHeaders[i].wFlags & HDR_ISREQUEST)
             {
+#ifdef __WIN32OS2__
+            requestStringLen += (lpwhr->pCustHeaders[i].lpszField) ? strlen(lpwhr->pCustHeaders[i].lpszField) : 0 +
+                (lpwhr->pCustHeaders[i].lpszValue) ? strlen(lpwhr->pCustHeaders[i].lpszValue) : 0 + 4; /*: \r\n */
+#else
             requestStringLen += strlen(lpwhr->pCustHeaders[i].lpszField) +
                 strlen(lpwhr->pCustHeaders[i].lpszValue) + 4; /*: \r\n */
+#endif
             }
     }
@@ -647 +652 @@
        if (lpwhr->StdHeaders[i].wFlags & HDR_ISREQUEST)
        {
+#ifdef __WIN32OS2__
+          requestStringLen += (lpwhr->StdHeaders[i].lpszField) ? strlen(lpwhr->StdHeaders[i].lpszField) : 0 +
+             (lpwhr->StdHeaders[i].lpszValue) ? strlen(lpwhr->StdHeaders[i].lpszValue) : 0 + 4; /*: \r\n */
+#else
           requestStringLen += strlen(lpwhr->StdHeaders[i].lpszField) +
              strlen(lpwhr->StdHeaders[i].lpszValue) + 4; /*: \r\n */
+#endif
        }
     }