sdongles/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Fixed bug in escape function, return data length in ebx.

Browse Source 
git-svn-id: svn://kolibrios.org@4831 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2014-04-14 14:39:53 +00:00
parent f5f92c1d66
commit 66ebe18f55
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
programs/develop/libraries/http/http.asm
View File

@ -1118,15 +1118,19 @@ endp
;;================================================================================================;; ;;================================================================================================;;
proc URI_escape URI ;/////////////////////////////////////////////////////////////////////////////;; proc HTTP_escape URI ;////////////////////////////////////////////////////////////////////////////;;
;;------------------------------------------------------------------------------------------------;; ;;------------------------------------------------------------------------------------------------;;
;? ;; ;? ;;
;;------------------------------------------------------------------------------------------------;; ;;------------------------------------------------------------------------------------------------;;
;> URI = ptr to ASCIIZ URI ;; ;> URI = ptr to ASCIIZ URI ;;
;;------------------------------------------------------------------------------------------------;; ;;------------------------------------------------------------------------------------------------;;
;< eax = 0 (error) / ptr to ASCIIZ URI ;; ;< eax = 0 (error) / ptr to ASCIIZ URI/data ;;
;< ebx = length of escaped URI/data ;;
;;================================================================================================;; ;;================================================================================================;;
; TODO: instead of static buffer allocation, make it 4096 bytes and larger only if needed
pusha pusha
invoke mem.alloc, URLMAXLEN invoke mem.alloc, URLMAXLEN
@ -1145,7 +1149,8 @@ proc URI_escape URI ;///////////////////////////////////////////////////////////
mov cl, al mov cl, al
and cl, 0x1f and cl, 0x1f
mov bl, al mov bl, al
shr bl, 5 shr bl, 3
and bl, not 3
bt dword[bits_must_escape + ebx], ecx bt dword[bits_must_escape + ebx], ecx
jc .escape jc .escape
@ -1168,6 +1173,9 @@ proc URI_escape URI ;///////////////////////////////////////////////////////////
.done: .done:
stosb stosb
sub edi, [esp + 7 * 4]
dec edi
mov [esp + 4 * 4], edi
popa popa
ret ret
@ -1182,7 +1190,7 @@ endp
;;================================================================================================;; ;;================================================================================================;;
proc URI_unescape URI ;///////////////////////////////////////////////////////////////////////////;; proc HTTP_unescape URI ;//////////////////////////////////////////////////////////////////////////;;
;;------------------------------------------------------------------------------------------------;; ;;------------------------------------------------------------------------------------------------;;
;? ;; ;? ;;
;;------------------------------------------------------------------------------------------------;; ;;------------------------------------------------------------------------------------------------;;
@ -1687,8 +1695,8 @@ export \
HTTP_process , 'process' , \ HTTP_process , 'process' , \
HTTP_free , 'free' , \ HTTP_free , 'free' , \
HTTP_stop , 'stop' , \ HTTP_stop , 'stop' , \
URI_escape , 'escape' , \ HTTP_escape , 'escape' , \
URI_unescape , 'unescape' HTTP_unescape , 'unescape'
; HTTP_put , 'put' , \ ; HTTP_put , 'put' , \
; HTTP_delete , 'delete' , \ ; HTTP_delete , 'delete' , \