Fix Visual Studio Code Analysis warning C6011: Dereferencing NULL pointer 'returnedDe...
authorcmaynard <cmaynard@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 13 Dec 2013 18:25:06 +0000 (18:25 +0000)
committercmaynard <cmaynard@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 13 Dec 2013 18:25:06 +0000 (18:25 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@54051 f5534014-38df-0310-8fa8-9805f1628bb7

ui/win32/print_win32.c

index 16e5fb2b02520575e7905be91de73392ed01a873..69fadb88ae8d961797f4a8ef6668b06d14db80ec 100644 (file)
@@ -130,6 +130,14 @@ static HDC get_printer_dc(short *width, short *height)
         /* http://msdn.microsoft.com/en-us/library/windows/desktop/dd162931%28v=vs.85%29.aspx */
         returnedDevmode = (PDEVMODE)GlobalLock(pdlg.hDevMode);
 
+        if (returnedDevmode == NULL) {
+            if (pdlg.hDevMode)
+                GlobalFree(pdlg.hDevMode);
+            if (pdlg.hDevNames)
+                GlobalFree(pdlg.hDevNames);
+            return NULL;
+        }
+
         if (returnedDevmode->dmOrientation == DMORIENT_LANDSCAPE) {
             *width = returnedDevmode->dmPaperLength;
             *height = returnedDevmode->dmPaperWidth;