Fixed #6632

(cherry picked from commit ceb0e8b4f1facb58849b2573fe60e3e512879a77)

diff --git a/winpr/libwinpr/file/generic.c b/winpr/libwinpr/file/generic.c
index 9f6dc9f..1f8bf99 100644 (file)
--- a/winpr/libwinpr/file/generic.c
+++ b/winpr/libwinpr/file/generic.c
@@ -361,7 +361,6 @@ BOOL ReadFileEx(HANDLE hFile, LPVOID lpBuffer, DWORD nNumberOfBytesToRead,
 
        WLog_ERR(TAG, "ReadFileEx operation not implemented");
        return FALSE;
-       return TRUE;
 }
 
 BOOL ReadFileScatter(HANDLE hFile, FILE_SEGMENT_ELEMENT aSegmentArray[], DWORD nNumberOfBytesToRead,

diff --git a/winpr/libwinpr/utils/image.c b/winpr/libwinpr/utils/image.c
index a1155e5..d3a150c 100644 (file)
--- a/winpr/libwinpr/utils/image.c
+++ b/winpr/libwinpr/utils/image.c
@@ -163,7 +163,7 @@ int winpr_bitmap_write(const char* filename, const BYTE* data, int width, int he
 
        bmp_header = winpr_bitmap_construct_header(width, height, bpp);
        if (!bmp_header)
-               return -1;
+               goto fail;
 
        if (fwrite(bmp_header, WINPR_IMAGE_BMP_HEADER_LEN, 1, fp) != 1 ||
            fwrite((void*)data, img_size, 1, fp) != 1)