From 523bb2473470242c9b167584247bf7c6b4bcb8d5 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 2 Feb 2016 14:19:10 +0100 Subject: add error check to sysconf call --- ext/standard/exec.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ext/standard/exec.c b/ext/standard/exec.c index 461bef4f72..329066e2b7 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -50,6 +50,10 @@ #include #endif +#if HAVE_LIMITS_H +#include +#endif + #ifdef PHP_WIN32 # include "win32/php_stdint.h" #else @@ -67,6 +71,13 @@ PHP_MINIT_FUNCTION(exec) { #ifdef _SC_ARG_MAX cmd_max_len = sysconf(_SC_ARG_MAX); + if (-1 == cmd_max_len) { +#ifdef _POSIX_ARG_MAX + cmd_max_len = _POSIX_ARG_MAX; +#else + cmd_max_len = 4096; +#endif + } #elif defined(ARG_MAX) cmd_max_len = ARG_MAX; #elif defined(PHP_WIN32) -- cgit v1.2.1