Fixed bug #26938 (exec() has problems reading long lines).

diff --git a/NEWS b/NEWS
index 38cffe100e4532cead430c35e9af1bc443d0b472..4f8057b6adc0e339baca0980b3df5f3c7a19bb3a 100644 (file)
--- 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 a2f8571d572f698474cb4826d55e2f8e5932b230..cc579e9be72a30c2520da8945912879c0f432582 100644 (file)
--- 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) {