From dfe2e8c1e19fc51f2b5f275fabe0ce823dd51386 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 19 Jan 2014 11:39:45 +0000 Subject: [PATCH] Fix possible crash in TAR header parsing code. Check that the iterator is valid before using its value, otherwise the validity check was useless. Closes #15888. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/tarstrm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/tarstrm.cpp b/src/common/tarstrm.cpp index 87074cc278..ef74c3d8ef 100644 --- a/src/common/tarstrm.cpp +++ b/src/common/tarstrm.cpp @@ -902,7 +902,7 @@ wxTarNumber wxTarInputStream::GetHeaderNumber(int id) const if ((value = GetExtendedHeader(m_hdr->Name(id))) != wxEmptyString) { wxTarNumber n = 0; wxString::const_iterator p = value.begin(); - while (*p == ' ' && p != value.end()) + while (p != value.end() && *p == ' ') p++; while (isdigit(*p)) n = n * 10 + (*p++ - '0');