From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 19 Mar 2001 18:27:59 +0000 (+0000)
Subject: wxImage::Ok() now returns false for images with 0 width or height
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/de8c48cf464e67572ba2927dd9f7dfe9e7d3488f

wxImage::Ok() now returns false for images with 0 width or height


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 430bf440d0..3e54488163 100644
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -525,7 +525,10 @@ unsigned char wxImage::GetBlue( int x, int y ) const
 
 bool wxImage::Ok() const
 {
-    return (M_IMGDATA && M_IMGDATA->m_ok);
+    // image of 0 width or height can't be considered ok - at least because it
+    // causes crashes in ConvertToBitmap() if we don't catch it in time
+    wxImageRefData *data = M_IMGDATA;
+    return data && data->m_ok && data->m_width && data->m_height;
 }
 
 char unsigned *wxImage::GetData() const