From ba5787676d002f76b4c3944cb598b626f10f058d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 30 Mar 2007 13:43:31 +0000 Subject: [PATCH] test whether pointer is non-NULL before using it, not after, in wxAnimation::Load() (thanks coverity) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/animateg.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/generic/animateg.cpp b/src/generic/animateg.cpp index c957313fad..a2bb840349 100644 --- a/src/generic/animateg.cpp +++ b/src/generic/animateg.cpp @@ -147,10 +147,6 @@ bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type) handler = FindHandler(type); - // do a copy of the handler from the static list which we will own - // as our reference data - m_refData = handler->Clone(); - if (handler == NULL) { wxLogWarning( _("No animation handler for type %ld defined."), type ); @@ -158,6 +154,11 @@ bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type) return false; } + + // do a copy of the handler from the static list which we will own + // as our reference data + m_refData = handler->Clone(); + if (stream.IsSeekable() && !M_ANIMDATA->CanRead(stream)) { wxLogError(_("Animation file is not of type %ld."), type); -- 2.50.0