ba2199bc82
- Resolve backlog of CVEs PR: 201513 Reported by: Sevan Janiyan Submitted by: Jason Unovitch (maintainer) Security: CVE-2004-0941 [1] Security: CVE-2007-0455 [1] Security: CVE-2007-2756 [1] Security: CVE-2007-3472 [1] Security: CVE-2007-3473 [1] Security: CVE-2007-3477 [1] Security: CVE-2009-3546 [1] Security: CVE-2015-4695 [2] Security: CVE-2015-4696 [3] Security: CVE-2015-0848 [4] Security: CVE-2015-4588 [4] Security: ca139c7f-2a8c-11e5-a4a5-002590263bf5 Obtained From: CentOS libwmf RPM git [1] Obtained From: Debian Bug 784205 [2] Obtained From: Debian Bug 784192 [3] Obtained From: Red Hat Bug 1227243 [4] MFH: 2015Q3
20 lines
578 B
Text
20 lines
578 B
Text
--- src/ipa/ipa/bmp.h 2015-06-02 11:35:04.072201795 +0100
|
|
+++ src/ipa/ipa/bmp.h 2015-06-02 11:35:20.647406414 +0100
|
|
@@ -1145,8 +1143,15 @@
|
|
}
|
|
}
|
|
else
|
|
- { /* Convert run-length encoded raster pixels. */
|
|
- DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image);
|
|
+ {
|
|
+ if (bmp_info.bits_per_pixel == 8) /* Convert run-length encoded raster pixels. */
|
|
+ {
|
|
+ DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image);
|
|
+ }
|
|
+ else
|
|
+ { WMF_ERROR (API,"Unexpected pixel depth");
|
|
+ API->err = wmf_E_BadFormat;
|
|
+ }
|
|
}
|
|
|
|
if (ERR (API))
|