cvs: php4 /main fopen-wrappers.c main.c

stas Fri Sep 8 05:52:05 2000 EDT Modified files: /php4/main fopen-wrappers.c main.c Log: Never trust snprintf return value Index: php4/main/fopen-wrappers.c diff -u php4/main/fopen-wrappers.c:1.88 php4/main/fopen-wrappers.c:1.89 --- php4/main/fopen-wrappers.c:1.88 Tue Sep 5 09:36:56 2000 +++ php4/main/fopen-wrappers.c Fri Sep 8 05:52:05 2000 @@ -16,7 +16,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.c,v 1.88 2000/09/05 16:36:56 venaas Exp $ */ +/* $Id: fopen-wrappers.c,v 1.89 2000/09/08 12:52:05 stas Exp $ */ #include "php.h" #include "php_globals.h" @@ -567,6 +567,9 @@ } else { len = snprintf(hdr_line, sizeof(hdr_line), "Host: %s\r\n", resource->host); + } + if(len > sizeof(hdr_line) - 1) { + len = sizeof(hdr_line) - 1; } if (len > 0) { SOCK_WRITE(hdr_line, *socketd); Index: php4/main/main.c diff -u php4/main/main.c:1.315 php4/main/main.c:1.316 --- php4/main/main.c:1.315 Fri Sep 8 05:32:29 2000 +++ php4/main/main.c Fri Sep 8 05:52:05 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.315 2000/09/08 12:32:29 stas Exp $ */ +/* $Id: main.c,v 1.316 2000/09/08 12:52:05 stas Exp $ */ #include <stdio.h> @@ -317,6 +317,9 @@ va_start(args, format); size = vsnprintf(buffer, sizeof(buffer), format, args); + if(size > sizeof(buffer) - 1) { + size = sizeof(buffer) - 1; + } ret = PHPWRITE(buffer, size); va_end(args);