Fix EOF cases

Sascha Schumann · Sascha Schumann · commit bfd2a857b291 · 2002-10-04T19:48:59.000Z
Noticed by: Ilia
diff --git a/main/streams.c b/main/streams.c
@@ -656,6 +656,7 @@ static char *php_stream_locate_eol(php_stream *stream TSRMLS_DC)
 PHPAPI char *_php_stream_gets(php_stream *stream, char *buf, size_t maxlen TSRMLS_DC)
 {
 	size_t avail = 0;
+	int did_copy = 0;
 	
 	if (maxlen == 0)
 		return NULL;
@@ -704,6 +705,7 @@ PHPAPI char *_php_stream_gets(php_stream *stream, char *buf, size_t maxlen TSRML
 			buf += cpysz;
 			maxlen -= cpysz;
 
+			did_copy = 1;
 			if (done) {
 				break;
 			}
@@ -721,6 +723,9 @@ PHPAPI char *_php_stream_gets(php_stream *stream, char *buf, size_t maxlen TSRML
 		}
 	}
 	
+	if (!did_copy)
+		return NULL;
+	
 	buf[0] = '\0';
 
 	return buf;

Original file line number	Diff line number	Diff line change
`@@ -656,6 +656,7 @@ static char php_stream_locate_eol(php_stream stream TSRMLS_DC)`
`656`	`656`	`PHPAPI char _php_stream_gets(php_stream stream, char *buf, size_t maxlen TSRMLS_DC)`
`657`	`657`	`{`
`658`	`658`	`size_t avail = 0;`
	`659`	`+ int did_copy = 0;`
`659`	`660`
`660`	`661`	`if (maxlen == 0)`
`661`	`662`	`return NULL;`
`@@ -704,6 +705,7 @@ PHPAPI char _php_stream_gets(php_stream stream, char *buf, size_t maxlen TSRML`
`704`	`705`	`buf += cpysz;`
`705`	`706`	`maxlen -= cpysz;`
`706`	`707`
	`708`	`+ did_copy = 1;`
`707`	`709`	`if (done) {`
`708`	`710`	`break;`
`709`	`711`	`}`
`@@ -721,6 +723,9 @@ PHPAPI char _php_stream_gets(php_stream stream, char *buf, size_t maxlen TSRML`
`721`	`723`	`}`
`722`	`724`	`}`
`723`	`725`
	`726`	`+ if (!did_copy)`
	`727`	`+ return NULL;`
	`728`	`+`
`724`	`729`	`buf[0] = '\0';`
`725`	`730`
`726`	`731`	`return buf;`