From 6f0344c7ff90ee54cc03a9df0f6d9f8e1f6b4897 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 7 Mar 2005 20:06:14 +0000 Subject: [PATCH] fix evaluation order bug (patch 1158099) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/uri.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common/uri.cpp b/src/common/uri.cpp index 0f03cf5aa5..d7e42961a9 100644 --- a/src/common/uri.cpp +++ b/src/common/uri.cpp @@ -115,10 +115,9 @@ const wxChar* wxURI::Create(const wxString& uri) wxChar wxURI::TranslateEscape(const wxChar* s) { - wxASSERT_MSG(IsHex(*s) && IsHex(*(s+1)), wxT("Invalid escape!")); + wxASSERT_MSG( IsHex(s[0]) && IsHex(s[1]), wxT("Invalid escape sequence!")); - //<<4 == 16 - return (wxChar)( CharToHex(*s) << 4 ) | CharToHex(*++s); + return (wxChar)( CharToHex(s[0]) << 4 ) | CharToHex(s[1]); } wxString wxURI::Unescape(const wxString& uri) -- 2.45.2