From e334f70b028b2053452827bfdef876abb6699510 Mon Sep 17 00:00:00 2001 From: winckel Date: Thu, 6 Feb 2014 10:44:37 +0000 Subject: [PATCH] Fixed an issue when USIM_DIR, NVRAM_DIR and PWDenvironement variable are not defined for NAS UE. git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5041 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- openair-cn/NAS/EURECOM-NAS/src/util/memory.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/openair-cn/NAS/EURECOM-NAS/src/util/memory.c b/openair-cn/NAS/EURECOM-NAS/src/util/memory.c index 5d434be03a..ad3c1cfc4e 100644 --- a/openair-cn/NAS/EURECOM-NAS/src/util/memory.c +++ b/openair-cn/NAS/EURECOM-NAS/src/util/memory.c @@ -61,17 +61,20 @@ char* memory_get_path(const char* dirname, const char* filename) /* Get non-volatile data directory */ const char* path = getenv(dirname); if (path == NULL) { - path = getenv(DEFAULT_NAS_PATH); + path = getenv(DEFAULT_NAS_PATH); + } + if (path == NULL) { + return NULL; } /* Append non-volatile data file name */ size_t size = strlen(path) + strlen(filename) + 1; char* data_filename = (char*)malloc(size+1); if (data_filename != NULL) { - if (size != sprintf(data_filename, "%s/%s", path, filename)) { - free(data_filename); - return NULL; - } + if (size != sprintf(data_filename, "%s/%s", path, filename)) { + free(data_filename); + return NULL; + } } return data_filename;