From 16c27286345e585a99bab7523639c7ffea03c5f8 Mon Sep 17 00:00:00 2001 From: Scott Griepentrog Date: Wed, 22 Jan 2014 22:16:47 +0000 Subject: [PATCH] pbx.c: Pre-initialize timezone to avoid crash on destroy In ast_build_timing, initialize the timezone value to NULL in order to avoid deferencing an uninitialized value later when calling ast_destroy_timing. The timezone value could be uninitialized if ast_build_timing were to fail due to a zero length time string. (closes issue ASTERISK-22861) Reported by: Sebastian Murray-Roberts Review: https://reviewboard.asterisk.org/r/3134/ Patches: ast_build_timing-initialize-timezone.patch uploaded by coreyfarrell (license 5909) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@406241 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/pbx.c | 4 ++-- utils/extconf.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main/pbx.c b/main/pbx.c index e370ae7431..241d0641a7 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -8239,6 +8239,8 @@ int ast_build_timing(struct ast_timing *i, const char *info_in) char *info; int j, num_fields, last_sep = -1; + i->timezone = NULL; + /* Check for empty just in case */ if (ast_strlen_zero(info_in)) { return 0; @@ -8258,8 +8260,6 @@ int ast_build_timing(struct ast_timing *i, const char *info_in) /* save the timezone, if it is specified */ if (num_fields == 5) { i->timezone = ast_strdup(info + last_sep + 1); - } else { - i->timezone = NULL; } /* Assume everything except time */ diff --git a/utils/extconf.c b/utils/extconf.c index 99df9e9ec1..7131e13b17 100644 --- a/utils/extconf.c +++ b/utils/extconf.c @@ -4439,6 +4439,8 @@ int ast_build_timing(struct ast_timing *i, const char *info_in) char *info; int j, num_fields, last_sep = -1; + i->timezone = NULL; + /* Check for empty just in case */ if (ast_strlen_zero(info_in)) { return 0; @@ -4458,8 +4460,6 @@ int ast_build_timing(struct ast_timing *i, const char *info_in) /* save the timezone, if it is specified */ if (num_fields == 5) { i->timezone = ast_strdup(info + last_sep + 1); - } else { - i->timezone = NULL; } /* Assume everything except time */