[PATCH 3/3] Prevent a potential NULL dereference

Paul Vriens Paul.Vriens.Wine at gmail.com
Tue Sep 21 08:43:31 CDT 2010


---
 dlls/wineps.drv/init.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c
index 685a56a..dd3c579 100644
--- a/dlls/wineps.drv/init.c
+++ b/dlls/wineps.drv/init.c
@@ -271,9 +271,10 @@ static LPDEVMODEA DEVMODEdupWtoA(HANDLE heap, const DEVMODEW *dmW)
     LPDEVMODEA dmA;
     DWORD size;
     BOOL Formname;
-    ptrdiff_t off_formname = (const char *)dmW->dmFormName - (const char *)dmW;
+    ptrdiff_t off_formname;
 
     if(!dmW) return NULL;
+    off_formname = (const char *)dmW->dmFormName - (const char *)dmW;
     Formname = (dmW->dmSize > off_formname);
     size = dmW->dmSize - CCHDEVICENAME - (Formname ? CCHFORMNAME : 0);
     dmA = HeapAlloc(heap, HEAP_ZERO_MEMORY, size + dmW->dmDriverExtra);
-- 
1.6.2.5


--------------070606090200040008010904--



More information about the wine-patches mailing list