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

HTTP library: correctly parse URL's that have no page address

Browse Source 
git-svn-id: svn://kolibrios.org@4161 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2013-11-04 16:14:13 +00:00
parent f11c912eea
commit cb3c960361
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -607,7 +607,7 @@ locals
pageaddr dd ? pageaddr dd ?
endl endl
DEBUGF 1, "URL: %s\n", [URL] DEBUGF 1, "parsing URL: %s\n", [URL]
; remove any leading protocol text ; remove any leading protocol text
mov esi, [URL] mov esi, [URL]
@ -622,7 +622,7 @@ endl
dec ecx dec ecx
jnz .loop1 jnz .loop1
; URL invalid ! DEBUGF 1, "Invalid URL\n"
xor eax, eax xor eax, eax
ret ret
@ -636,15 +636,16 @@ endl
sub esi, [URL] ; calculate total length of URL sub esi, [URL] ; calculate total length of URL
mov [urlsize], esi mov [urlsize], esi
;;; FIXME: urls with no pageaddr are not parsed correctly!!
; now look for page delimiter - it's a '/' character ; now look for page delimiter - it's a '/' character
mov ecx, esi ; URL length mov ecx, esi ; URL length
mov edi, [URL] mov edi, [URL]
mov al, '/' mov al, '/'
repne scasb repne scasb
jne @f
dec edi ; return one char, '/' must be part of the pageaddr dec edi ; return one char, '/' must be part of the pageaddr
inc ecx ; inc ecx ;
@@:
push ecx edi ; remember the pointer and length of pageaddr push ecx edi ; remember the pointer and length of pageaddr
mov ecx, edi mov ecx, edi
@ -662,7 +663,7 @@ endl
xor al, al xor al, al
stosb stosb
mov [pageaddr], null_str ; assume there is no pageaddr mov [pageaddr], str_slash ; assume there is no pageaddr
pop esi ecx pop esi ecx
test ecx, ecx test ecx, ecx
jz .no_page jz .no_page
@ -770,7 +771,7 @@ base64_table db 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
db '0123456789+/' db '0123456789+/'
str_cl db 'content-length', 0 str_cl db 'content-length', 0
null_str db 0 str_slash db '/', 0
str_te db 'transfer-encoding', 0 str_te db 'transfer-encoding', 0
include_debug_strings include_debug_strings