Resolve problems with psrp issues #437,#438,#439

Issues fixed: Issue #437: Buffer overrun in httpclient.c - _CreateHttpHeader Issue #438: Cannot enable libmi logging on psrp client using v1.4.0-6 Issue #439: httpclient.c:_RequestCallbackWrite not handling partial sends.
microsoft · Nov 13, 2017 · 1770fbe · 1770fbe
1 parent 62bc7f5
commit 1770fbe
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/Unix/base/paths.c b/Unix/base/paths.c
@@ -85,9 +85,9 @@ static PathInfo _paths[] =
     { "httpclientsendtracefile", HTTPCLIENTSENDTRACEFILE, MI_FALSE },
     { "httpclientrecvtracefile", HTTPCLIENTRECVTRACEFILE, MI_FALSE },
     { "srcdir", CONFIG_SRCDIR, MI_FALSE },
-    { "credsdir", CONFIG_CREDSDIR, MI_FALSE },
     { "keytabfile", KRB5_KEYTABPATH, MI_FALSE },
     { "clientconfigfile", CLIENTCONFIGFILE, MI_FALSE },
+    { "credsdir", CONFIG_CREDSDIR, MI_FALSE }
 };
 
 #include <pal/ownedmemory.h>

diff --git a/Unix/base/paths.h b/Unix/base/paths.h
@@ -47,8 +47,9 @@ typedef enum _PathID
     ID_HTTPCLIENTSENDTRACEFILE,
     ID_HTTPCLIENTRECVTRACEFILE,
     ID_SRCDIR,
+    ID_KRB5_KEYTABPATH,
     ID_CLIENTCONFIGFILE,
-    ID_KRB5_KEYTABPATH
+    ID_CREDSDIR
 }
 PathID;
 
@@ -60,7 +61,7 @@ void PrintPaths();
 
 /* Set path form nickname (e.g., "prefix", "libdir") */
 int SetPathFromNickname(
-    const char* nickname, 
+    const char* nickname,
     const char* path);
 
 MI_Boolean IsNickname(const char* nickname);

diff --git a/Unix/http/httpclient.c b/Unix/http/httpclient.c
@@ -1163,18 +1163,18 @@ Http_CallbackResult _WriteClientHeader(HttpClient_SR_SocketData* handler)
     size_t buf_size, sent;
     MI_Result r;
 
-    /* Do we have any data to send? */
-    if (!handler->sendHeader)
-    {
-        goto Error;
-    }
-
     /* are we done with header? */
     if (handler->sendingState == RECV_STATE_CONTENT)
     {
         return PRT_CONTINUE;
     }
 
+    /* Do we have any data to send? */
+    if (!handler->sendHeader)
+    {
+        goto Error;
+    }
+
     LOGD2((ZT("_WriteHeader - Begin")));
 
 #if ENCRYPT_DECRYPT
@@ -1969,7 +1969,8 @@ Page* _CreateHttpHeader(
         SizeTAdd(pageSize, uri_len,  &pageSize) != S_OK ||
         SizeTAdd(pageSize, sizeof(Page), &pageSize) != S_OK ||
         (contentType && SizeTAdd(pageSize, Strlen(contentType), &pageSize) != S_OK) ||
-        (authHeader  && SizeTAdd(pageSize, Strlen(authHeader), &pageSize) != S_OK) )
+        (authHeader  && SizeTAdd(pageSize, Strlen(authHeader), &pageSize) != S_OK)  || 
+        SizeTAdd(pageSize, 2, &pageSize) != S_OK )
     {
         // Overflow
         return 0;