[tbb-commits] [tor-browser/tor-browser-31.1.1esr-4.x-1] Bug 973138 - Fixed goto crossing variable declaration (fixes GCC compilation).

[mikeperry at torproject.org]

commit 014431cc558784f89eb9602af976e602f4ea2cff
Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon May 12 11:01:53 2014 +0200

    Bug 973138 - Fixed goto crossing variable declaration (fixes GCC compilation).
    
    --HG--
    extra : rebase_source : 8b488731cb06cab3fc1e74e66f88046583e95fc2
---
 mozglue/build/WindowsDllBlocklist.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mozglue/build/WindowsDllBlocklist.cpp b/mozglue/build/WindowsDllBlocklist.cpp
index 38bdc24..dde0d8b 100644
--- a/mozglue/build/WindowsDllBlocklist.cpp
+++ b/mozglue/build/WindowsDllBlocklist.cpp
@@ -487,6 +487,7 @@ patched_LdrLoadDll (PWCHAR filePath, PULONG flags, PUNICODE_STRING moduleFileNam
 #define DLLNAME_MAX 128
   char dllName[DLLNAME_MAX+1];
   wchar_t *dll_part;
+  char *dot;
   DllBlockInfo *info;
 
   int len = moduleFileName->Length / 2;
@@ -553,7 +554,7 @@ patched_LdrLoadDll (PWCHAR filePath, PULONG flags, PUNICODE_STRING moduleFileNam
 
   // Block a suspicious binary that uses various 12-digit hex strings
   // e.g. MovieMode.48CA2AEFA22D.dll (bug 973138)
-  char * dot = strchr(dllName, '.');
+  dot = strchr(dllName, '.');
   if (dot && (strchr(dot+1, '.') == dot+13)) {
     char * end = nullptr;
     _strtoui64(dot+1, &end, 16);