summaryrefslogtreecommitdiff
path: root/indra/llcorehttp
diff options
context:
space:
mode:
authorBrad Kittenbrink <brad@lindenlab.com>2019-04-11 17:14:15 -0700
committerBrad Kittenbrink <brad@lindenlab.com>2019-04-11 17:14:15 -0700
commit6f9ea467c2af271baa8cb1a1afc274de4ffe596d (patch)
tree1416ce48df1bd58331cabb4028b0a42d645ad5de /indra/llcorehttp
parente4a244a6cb1837d1748381e4552b5199a5782150 (diff)
SL-10948: Fix for crash in llcorehttp/_httplibcurl.cpp.
The crash can appear on some non-windows platforms (any LP64 model platforms). Depending on alignment this can overwrite one word of the pointer `op` declared above. Subsequently it will crash when later writing to memory through that pointer
Diffstat (limited to 'indra/llcorehttp')
-rw-r--r--indra/llcorehttp/_httplibcurl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcorehttp/_httplibcurl.cpp b/indra/llcorehttp/_httplibcurl.cpp
index abd304f6a5..975ce8a4d5 100644
--- a/indra/llcorehttp/_httplibcurl.cpp
+++ b/indra/llcorehttp/_httplibcurl.cpp
@@ -355,7 +355,8 @@ bool HttpLibcurl::completeRequest(CURLM * multi_handle, CURL * handle, CURLcode
}
if (op->mStatus)
{
- int http_status(HTTP_OK);
+ // note: CURLINFO_RESPONSE_CODE requires a long - https://curl.haxx.se/libcurl/c/CURLINFO_RESPONSE_CODE.html
+ long http_status(HTTP_OK);
if (handle)
{