summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--ext/standard/exec.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 38cffe100e..4f8057b6ad 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ PHP NEWS
(Derick)
- Fixed problems with longlong values in mysqli. (Georg)
- Fixed class name case preserving of user defined classes. (Marcus)
+- Fixed bug #26938 (exec() has problems reading long lines).
+ (Ilia, runekl[at]opoint[dot]com
- Fixed bug #26947 (ext/dom: Crash when using DomDocument::getElementById()).
(Christian)
- Fixed bug #26911 (crash in sqlite extension when fetching data from empty
diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index a2f8571d57..cc579e9be7 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -125,7 +125,7 @@ int php_exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC)
}
continue;
} else if (b != buf) {
- bufl += buflen - EXEC_INPUT_BUF;
+ bufl += b - buf;
}
if (type == 1) {