@@ -221,7 +221,8 @@ def tryHint(idx):
221221 markingValue  =  "'%s'"  %  CHAR_INFERENCE_MARK 
222222 unescapedCharValue  =  unescaper .escape ("'%s'"  %  decodeIntToUnicode (posValue ))
223223 forgedPayload  =  agent .extractPayload (payload ) or  "" 
224-  forgedPayload  =  safeStringFormat (forgedPayload .replace (INFERENCE_GREATER_CHAR , INFERENCE_EQUALS_CHAR ), (expressionUnescaped , idx , posValue )).replace (markingValue , unescapedCharValue )
224+  forgedPayload  =  forgedPayload .replace (markingValue , unescapedCharValue )
225+  forgedPayload  =  safeStringFormat (forgedPayload .replace (INFERENCE_GREATER_CHAR , INFERENCE_EQUALS_CHAR ), (expressionUnescaped , idx , posValue ))
225226 result  =  Request .queryPage (agent .replacePayload (payload , forgedPayload ), timeBasedCompare = timeBasedCompare , raise404 = False )
226227 incrementCounter (getTechnique ())
227228
@@ -246,7 +247,8 @@ def validateChar(idx, value):
246247 # e.g.: ... > '%c' -> ... > ORD(..) 
247248 markingValue  =  "'%s'"  %  CHAR_INFERENCE_MARK 
248249 unescapedCharValue  =  unescaper .escape ("'%s'"  %  decodeIntToUnicode (value ))
249-  forgedPayload  =  safeStringFormat (validationPayload , (expressionUnescaped , idx )).replace (markingValue , unescapedCharValue )
250+  forgedPayload  =  validationPayload .replace (markingValue , unescapedCharValue )
251+  forgedPayload  =  safeStringFormat (forgedPayload , (expressionUnescaped , idx ))
250252
251253 result  =  not  Request .queryPage (forgedPayload , timeBasedCompare = timeBasedCompare , raise404 = False )
252254
@@ -352,7 +354,8 @@ def getChar(idx, charTbl=None, continuousOrder=True, expand=charsetType is None,
352354 # e.g.: ... > '%c' -> ... > ORD(..) 
353355 markingValue  =  "'%s'"  %  CHAR_INFERENCE_MARK 
354356 unescapedCharValue  =  unescaper .escape ("'%s'"  %  decodeIntToUnicode (posValue ))
355-  forgedPayload  =  safeStringFormat (payload , (expressionUnescaped , idx )).replace (markingValue , unescapedCharValue )
357+  forgedPayload  =  payload .replace (markingValue , unescapedCharValue )
358+  forgedPayload  =  safeStringFormat (forgedPayload , (expressionUnescaped , idx ))
356359 falsePayload  =  safeStringFormat (payload , (expressionUnescaped , idx )).replace (markingValue , NULL )
357360
358361 if  timeBasedCompare :
0 commit comments