From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 10 Feb 2009 16:14:27 +0000 (+0000)
Subject: MFB: Adjust condition
X-Git-Tag: php-5.2.9RC2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c752e95c3648e1422ffe53ddb56acc9cdc97299b;p=php

MFB: Adjust condition
---

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 7f0fe74599..e1fbaa835b 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -528,7 +528,7 @@ PHPAPI FILE *php_fopen_with_path(const char *filename, const char *mode, const c
 			*end = '\0';
 			end++;
 		}
-		if (snprintf(trypath, MAXPATHLEN, "%s/%s", ptr, filename) > MAXPATHLEN) {
+		if (snprintf(trypath, MAXPATHLEN, "%s/%s", ptr, filename) >= MAXPATHLEN) {
 			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s/%s path was truncated to %d", ptr, filename, MAXPATHLEN);
 		}
 		if (PG(safe_mode)) {
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index 0452d568df..8020731258 100644
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@ -1324,7 +1324,7 @@ not_relative_path:
 		/* getcwd() will return always return [DRIVE_LETTER]:/) on windows. */
 		*(cwd+3) = '\0';
 	
-		if (snprintf(trypath, MAXPATHLEN, "%s%s", cwd, filename) > MAXPATHLEN) {
+		if (snprintf(trypath, MAXPATHLEN, "%s%s", cwd, filename) >= MAXPATHLEN) {
 			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s/%s path was truncated to %d", cwd, filename, MAXPATHLEN);
 		}
 		
@@ -1387,7 +1387,7 @@ not_relative_path:
 		if (*ptr == '\0') {
 			goto stream_skip;
 		}
-		if (snprintf(trypath, MAXPATHLEN, "%s/%s", ptr, filename) > MAXPATHLEN) {
+		if (snprintf(trypath, MAXPATHLEN, "%s/%s", ptr, filename) >= MAXPATHLEN) {
 			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s/%s path was truncated to %d", ptr, filename, MAXPATHLEN);
 		}