Issue 1280 - Update v8

src/DefaultWebRequestWinInet.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 154 matching lines @@
         std::pair<std::string, std::string>(headerName, headerValue));
 
       nextHeaderNameStart++;
       prevHeaderStart = nextHeaderNameStart;
     }
   }
 
   // Get the response status code
   std::wstring statusStr;
   DWORD statusLen = 0;
-  res = WinHttpQueryHeaders(hRequest, WINHTTP_QUERY_STATUS_CODE, WINHTTP_HEADER_NAME_BY_INDEX, &statusStr[0], &statusLen, WINHTTP_NO_HEADER_INDEX);
+  res = WinHttpQueryHeaders(hRequest, WINHTTP_QUERY_STATUS_CODE, WINHTTP_HEADER_NAME_BY_INDEX, WINHTTP_NO_OUTPUT_BUFFER , &statusLen, WINHTTP_NO_HEADER_INDEX);

[Wladimir Palant, 2014/11/01 22:30:25]

Nit: no whitespace before comma please.

Either way, I don't see how the changes in this file are related.

[Felix Dahlke, 2014/11/02 03:55:20]

Missed the white space, agreed. As for this change, it's explained in the
description:

DefaultWebRequestWinInet
- std::basic_string::operator[i] has an assert in MSVS2010 which verifies the
size of string, in our case the size is zero and we should not call operator[].
The call of WinHttpQueryHeaders is adapted.

Since this is, how I see it, not the only change for supporting Visual Studio
2010, I accepted that we mix these two issues: V8 update and Visual Studio 2010.
I fully agree that it'd be much cleaner to do it in separate issues/commits.

[sergei, 2014/11/03 12:58:19]

reverted

   if (statusLen == 0)
   {
-    throw std::exception("Can't parse the status code");
+    if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
+    {
+      throw std::exception("Can't parse the status code");
+    }
   }
   statusStr.resize(statusLen / sizeof(std::wstring::value_type) + 1);
   res = WinHttpQueryHeaders(hRequest, WINHTTP_QUERY_STATUS_CODE, WINHTTP_HEADER_NAME_BY_INDEX, &statusStr[0], &statusLen, WINHTTP_NO_HEADER_INDEX);
   if ((statusLen == 0) || (!res))
   {
     throw std::exception("Can't parse the status code");
   }
   std::wistringstream(statusStr) >> result->responseStatus;
   result->status = AdblockPlus::DefaultWebRequest::NS_OK;
 
@@ skipping 148 matching lines @@
       ZeroMemory(outBuffer.get(), downloadSize+1);
 
       if (WinHttpReadData(hRequest, outBuffer.get(), downloadSize, &downloaded))
       {
         result.responseText.append(outBuffer.get(), downloaded);
       }
     }
   } while (downloadSize > 0);
   return result;
 }