Incorrect bfOffBits Calculation in WIN_ConvertDIBtoBMP

thouravi · slouken · commit 5c79f4cae19d · 2025-02-17T13:59:03.000-08:00
diff --git a/src/video/windows/SDL_windowsclipboard.c b/src/video/windows/SDL_windowsclipboard.c
@@ -145,7 +145,7 @@ static void *WIN_ConvertDIBtoBMP(HANDLE hMem, size_t *size)
                     pbfh->bfSize = (DWORD)bmp_size;
                     pbfh->bfReserved1 = 0;
                     pbfh->bfReserved2 = 0;
-                    pbfh->bfOffBits = (DWORD)(sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + color_table_size);
+                    pbfh->bfOffBits = (DWORD)(sizeof(BITMAPFILEHEADER) + pbih->biSize + color_table_size);
                     SDL_memcpy((Uint8 *)bmp + sizeof(BITMAPFILEHEADER), dib, dib_size);
                     *size = bmp_size;
                 }

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ static void WIN_ConvertDIBtoBMP(HANDLE hMem, size_t size)`
`145`	`145`	`pbfh->bfSize = (DWORD)bmp_size;`
`146`	`146`	`pbfh->bfReserved1 = 0;`
`147`	`147`	`pbfh->bfReserved2 = 0;`
`148`		`- pbfh->bfOffBits = (DWORD)(sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + color_table_size);`
	`148`	`+ pbfh->bfOffBits = (DWORD)(sizeof(BITMAPFILEHEADER) + pbih->biSize + color_table_size);`
`149`	`149`	`SDL_memcpy((Uint8 *)bmp + sizeof(BITMAPFILEHEADER), dib, dib_size);`
`150`	`150`	`*size = bmp_size;`
`151`	`151`	`}`