diff options
author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-09-18 22:30:20 +0000 |
---|---|---|
committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-09-18 22:30:20 +0000 |
commit | f32ea04f8977c126d84045a69da156a3c43e467b (patch) | |
tree | 31f51b7a28a0b883567ebe3a74c0fd7eff34ad88 | |
parent | 594916de39c0cb5df48321364be17ea6b95e20a0 (diff) | |
download | uhttpd-f32ea04f8977c126d84045a69da156a3c43e467b.tar.gz |
[package] uhttpd: fix possible CGI header line parsing beyound the empty line, thanks Linus Luessing for spotting it
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/package/uhttpd/src@28254 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r-- | uhttpd-cgi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/uhttpd-cgi.c b/uhttpd-cgi.c index ed68851..2f94fe2 100644 --- a/uhttpd-cgi.c +++ b/uhttpd-cgi.c @@ -1,7 +1,7 @@ /* * uhttpd - Tiny single-threaded httpd - CGI handler * - * Copyright (C) 2010 Jo-Philipp Wich <xm@subsignal.org> + * Copyright (C) 2010-2011 Jo-Philipp Wich <xm@subsignal.org> * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ static struct http_response * uh_cgi_header_parse(char *buf, int len, int *off) bufptr = &buf[0]; - for( pos = 0; pos < len; pos++ ) + for( pos = 0; pos < off; pos++ ) { if( !hdrname && (buf[pos] == ':') ) { @@ -60,11 +60,11 @@ static struct http_response * uh_cgi_header_parse(char *buf, int len, int *off) else if( (buf[pos] == '\r') || (buf[pos] == '\n') ) { - buf[pos++] = 0; - if( ! hdrname ) break; + buf[pos++] = 0; + if( (pos < len) && (buf[pos] == '\n') ) pos++; |