summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2018-02-01 15:30:01 +0100
committerAnatol Belski <ab@php.net>2018-02-01 15:30:01 +0100
commit138ea7c3fe6168c0de107893a8ffbe19f25b0c88 (patch)
tree50f5151f35b72f3975cdcc59b14e9ed1a3c94c83
parentbc584c408c3b6b556700b5395c007f8beb453300 (diff)
downloadphp-git-138ea7c3fe6168c0de107893a8ffbe19f25b0c88.tar.gz
Ensure there are no line breaks in the error msg
-rw-r--r--ext/standard/dl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index 89f8aa0569..9cfccd5235 100644
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -88,8 +88,10 @@ PHPAPI void *php_load_shlib(char *path, char **errp)
err = GET_DL_ERROR();
#ifdef PHP_WIN32
if (err && (*err)) {
+ size_t i = strlen(err);
(*errp)=estrdup(err);
LocalFree(err);
+ while (i > 0 && isspace((*errp)[i-1])) { (*errp)[i-1] = '\0'; i--; }
} else {
(*errp) = estrdup("<No message>");
}