KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

uhttpd: fix possible CGI header line parsing beyound the empty line, thanks Linus Luessing for spotting it

Browse source 
SVN-Revision: 28254
This commit is contained in:
Jo-Philipp Wich 2011-09-18 22:30:20 +00:00
parent b81588bd08
commit 12bbe8b2af
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/uhttpd/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=uhttpd PKG_NAME:=uhttpd
PKG_RELEASE:=26 PKG_RELEASE:=27
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_CONFIG_DEPENDS := \ PKG_CONFIG_DEPENDS := \

8
package/uhttpd/src/uhttpd-cgi.c
View file

@ -1,7 +1,7 @@
/* /*
* uhttpd - Tiny single-threaded httpd - CGI handler * 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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]; bufptr = &buf[0];
for( pos = 0; pos < len; pos++ ) for( pos = 0; pos < off; pos++ )
{ {
if( !hdrname && (buf[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') ) else if( (buf[pos] == '\r') || (buf[pos] == '\n') )
{ {
buf[pos++] = 0;
if( ! hdrname ) if( ! hdrname )
break; break;
buf[pos++] = 0;
if( (pos < len) && (buf[pos] == '\n') ) if( (pos < len) && (buf[pos] == '\n') )
pos++; pos++;