Commit 1f7ba42a authored by Jacek Caban's avatar Jacek Caban Committed by Mike Perry
Browse files

Bug 973138 - Fixed goto crossing variable declaration (fixes GCC compilation). 

--HG--
extra : rebase_source : 8b488731cb06cab3fc1e74e66f88046583e95fc2
parent 7ce0d79b

mozglue/build/WindowsDllBlocklist.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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);