From: Herman Semenov <GermanAizek(a)yandex.ru> --- libs/jxr/jxrgluelib/JXRGluePFC.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/jxr/jxrgluelib/JXRGluePFC.c b/libs/jxr/jxrgluelib/JXRGluePFC.c index f6f2e29c397..b6eb52babcb 100644 --- a/libs/jxr/jxrgluelib/JXRGluePFC.c +++ b/libs/jxr/jxrgluelib/JXRGluePFC.c @@ -2212,10 +2212,11 @@ ERR PKFormatConverter_InitializeConvert(PKFormatConverter* pFC, const PKPixelFor //================================ pFC->enPixelFormat = enPFTo; + size_t len_pExt = strlen(pExt); if (pExt != NULL && IsEqualGUID(&enPFTo, &GUID_PKPixelFormat24bppRGB) && - 0 == PKStrnicmp(pExt, ".bmp", strlen(pExt))) + 0 == PKStrnicmp(pExt, ".bmp", len_pExt)) enPFTo = GUID_PKPixelFormat24bppBGR; - if (pExt != NULL && (0 == PKStrnicmp(pExt, ".tif", strlen(pExt)) || 0 == PKStrnicmp(pExt, ".tiff", strlen(pExt)))) + if (pExt != NULL && (0 == PKStrnicmp(pExt, ".tif", len_pExt) || 0 == PKStrnicmp(pExt, ".tiff", len_pExt))) { if (IsEqualGUID(&enPFTo, &GUID_PKPixelFormat32bppBGRA)) enPFTo = GUID_PKPixelFormat32bppRGBA; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7143