From 2ab496bc50868dec681b33616ea6eee5dbe82b6a Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Fri, 15 Nov 2013 17:35:16 +0000 Subject: [PATCH] Fix potential rejection of valid MaxMemFree and ThreadStackSize directives. Submitted by: Mike Rumph Reviewed by: trawick git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542338 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ server/mpm_common.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/CHANGES b/CHANGES index e9b48738cc..6bf9b6890e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 + *) Fix potential rejection of valid MaxMemFree and ThreadStackSize + directives. [Mike Rumph ] + *) core: Add parse_errorlog_arg callback to ap_errorlog_provider to allow providers to check the ErrorLog argument. [Jan Kaluza] diff --git a/server/mpm_common.c b/server/mpm_common.c index 71e611356f..e1f0532447 100644 --- a/server/mpm_common.c +++ b/server/mpm_common.c @@ -389,6 +389,7 @@ const char *ap_mpm_set_max_mem_free(cmd_parms *cmd, void *dummy, return err; } + errno = 0; value = strtol(arg, NULL, 10); if (value < 0 || errno == ERANGE) return apr_pstrcat(cmd->pool, "Invalid MaxMemFree value: ", @@ -408,6 +409,7 @@ const char *ap_mpm_set_thread_stacksize(cmd_parms *cmd, void *dummy, return err; } + errno = 0; value = strtol(arg, NULL, 10); if (value < 0 || errno == ERANGE) return apr_pstrcat(cmd->pool, "Invalid ThreadStackSize value: ", -- 2.40.0