Alex Villacís Lasso : iccvid: Guard against null pointer reference.

Alexandre Julliard julliard at winehq.org
Mon Sep 17 07:59:59 CDT 2007


Module: wine
Branch: master
Commit: bbe9104514b696eb681d2f9961e7152f2e4bb4e3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bbe9104514b696eb681d2f9961e7152f2e4bb4e3

Author: Alex Villacís Lasso <a_villacis at palosanto.com>
Date:   Sat Sep 15 21:30:36 2007 -0500

iccvid: Guard against null pointer reference.

---

 dlls/iccvid/iccvid.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c
index b3e98bf..a34e58c 100644
--- a/dlls/iccvid/iccvid.c
+++ b/dlls/iccvid/iccvid.c
@@ -872,6 +872,11 @@ static LRESULT ICCVID_Decompress( ICCVID_Info *info, ICDECOMPRESS *icd, DWORD si
 
     if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) )
         return ICERR_BADPARAM;
+    if (info->cvinfo==NULL)
+    {
+        ERR("ICM_DECOMPRESS sent after ICM_DECOMPRESS_END\n");
+        return ICERR_BADPARAM;
+    }
 
     width  = icd->lpbiInput->biWidth;
     height = icd->lpbiInput->biHeight;
@@ -890,6 +895,11 @@ static LRESULT ICCVID_DecompressEx( ICCVID_Info *info, ICDECOMPRESSEX *icd, DWOR
 
     if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) )
         return ICERR_BADPARAM;
+    if (info->cvinfo==NULL)
+    {
+        ERR("ICM_DECOMPRESSEX sent after ICM_DECOMPRESS_END\n");
+        return ICERR_BADPARAM;
+    }
 
     /* FIXME: flags are ignored */
 




More information about the wine-cvs mailing list