osaf/services/saf/logsv/lgs/lgs_fmt.c  |  2 ++
 osaf/services/saf/logsv/lgs/lgs_util.c |  1 +
 2 files changed, 3 insertions(+), 0 deletions(-)


Do osafabort if localtime_r returns an error.

diff --git a/osaf/services/saf/logsv/lgs/lgs_fmt.c 
b/osaf/services/saf/logsv/lgs/lgs_fmt.c
--- a/osaf/services/saf/logsv/lgs/lgs_fmt.c
+++ b/osaf/services/saf/logsv/lgs/lgs_fmt.c
@@ -772,6 +772,7 @@ static int extractNotificationField(char
        /* Split timestamp in timeStampData */
        struct tm tm_info;
        eventTimeData = localtime_r((const time_t *)&totalTime, &tm_info);
+       osafassert(eventTimeData);
 
        switch (*fmtExpPtr++) {
        case N_NOTIFICATION_ID_LETTER:
@@ -1178,6 +1179,7 @@ int lgs_format_log_record(SaLogRecordT *
        /* Split timestamp in timeStampData */
        struct tm tm_info;
        timeStampData = localtime_r((const time_t *)&totalTime, &tm_info);
+       osafassert(timeStampData);
 
        /* Main formatting loop */
        for (;;) {
diff --git a/osaf/services/saf/logsv/lgs/lgs_util.c 
b/osaf/services/saf/logsv/lgs/lgs_util.c
--- a/osaf/services/saf/logsv/lgs/lgs_util.c
+++ b/osaf/services/saf/logsv/lgs/lgs_util.c
@@ -186,6 +186,7 @@ char *lgs_get_time(time_t *time_in)
        }
        struct tm tm_info;
        timeStampData = localtime_r(&testTime, &tm_info);
+       osafassert(timeStampData);
 
        stringSize = 5 * sizeof(char);
        snprintf(srcString, (size_t)stringSize, "%d", (timeStampData->tm_year + 
START_YEAR));

------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to