[PATCH 0/2] MR2368: wineps: PSDRV_WriteDIBPatternDict fixes

[Piotr Caban (＠piotr)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2368

[PATCH 1/2] wineps: Fix buffer overflow in PSDRV_WriteDIBPatternDict function.

[Piotr Caban]

From: Piotr Caban <piotr(a)codeweavers.com>

---
 dlls/wineps.drv/ps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c
index 7f7841d7ca7..829cc1173ef 100644
--- a/dlls/wineps.drv/ps.c
+++ b/dlls/wineps.drv/ps.c
@@ -974,7 +974,7 @@ BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, const BITMAPINFO *bmi, BYTE *bits, U
     w = bmi->bmiHeader.biWidth & ~0x7;
     h = abs_height & ~0x7;
 
-    buf = HeapAlloc( GetProcessHeap(), 0, sizeof(do_pattern) + 100 );
+    buf = HeapAlloc( GetProcessHeap(), 0, max(sizeof(do_pattern) + 100, 2 * w/8 * h + 1) );
     ptr = buf;
     for(y = h-1; y >= 0; y--) {
         for(x = 0; x < w/8; x++) {
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2368

[PATCH 2/2] wineps: Fix image bits access in PSDRV_WriteDIBPatternDict.

[Piotr Caban]

From: Piotr Caban <piotr(a)codeweavers.com>

---
 dlls/wineps.drv/ps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c
index 829cc1173ef..b0b27e62ac2 100644
--- a/dlls/wineps.drv/ps.c
+++ b/dlls/wineps.drv/ps.c
@@ -979,7 +979,7 @@ BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, const BITMAPINFO *bmi, BYTE *bits, U
     for(y = h-1; y >= 0; y--) {
         for(x = 0; x < w/8; x++) {
 	    sprintf(ptr, "%02x", *(bits + x/8 + y *
-				   (bmi->bmiHeader.biWidth + 31) / 32 * 4));
+				   ((bmi->bmiHeader.biWidth + 31) / 32) * 4));
 	    ptr += 2;
 	}
     }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2368

[PATCH 2/2] wineps: Fix image bits access in PSDRV_WriteDIBPatternDict.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=130466

Your paranoid android.


=== debian11 (32 bit report) ===

shell32:
progman_dde.c:274: Test failed: expected DMLERR_NO_ERROR, got 16393
progman_dde.c:275: Test failed: directory should not exist

[PATCH 0/2] MR2368: wineps: PSDRV_WriteDIBPatternDict fixes - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2368