From 91fc355a621ee984dfe168a0c0578f8231e1198b Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Wed, 21 May 2008 22:40:04 +0000 Subject: [PATCH] don't deref NULL. Found by Klockwork (www.klocwork.com) git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8515 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/formats/mod_sndfile/mod_sndfile.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/mod/formats/mod_sndfile/mod_sndfile.c b/src/mod/formats/mod_sndfile/mod_sndfile.c index 18719b0009..1331b14cc0 100644 --- a/src/mod/formats/mod_sndfile/mod_sndfile.c +++ b/src/mod/formats/mod_sndfile/mod_sndfile.c @@ -323,18 +323,22 @@ static switch_status_t setup_formats(void) char *p; struct format_map *map = switch_core_permanent_alloc(sizeof(*map)); switch_assert(map); - + map->ext = switch_core_permanent_strdup(info.extension); map->uext = switch_core_permanent_strdup(info.extension); map->format = info.format; - for (p = map->ext; *p; p++) { - *p = (char) tolower(*p); + if (map->ext) { + for (p = map->ext; *p; p++) { + *p = (char) tolower(*p); + } + switch_core_hash_insert(globals.format_hash, map->ext, map); } - for (p = map->uext; *p; p++) { - *p = (char) toupper(*p); + if (map->uext) { + for (p = map->uext; *p; p++) { + *p = (char) toupper(*p); + } + switch_core_hash_insert(globals.format_hash, map->uext, map); } - switch_core_hash_insert(globals.format_hash, map->ext, map); - switch_core_hash_insert(globals.format_hash, map->uext, map); supported_formats[len++] = (char *) info.extension; } format = info.format;