commit ebd459060ea4f42761402dd54acd0962c36136c2
author George Liu <liuxiwei@inspur.com> Wed Aug 26 14:21:10 2020 +0800
committer James Feist <james.feist@linux.intel.com> Thu Aug 27 16:42:37 2020 +0000
tree 61f0255c5af53bf11bf490ab7bc1f5592382bc31
parent f5b16f030f1fd67412c7d279e79b58ffc5e36f67

Fix potential null pointer dereference

Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: Ibeedbe61fa1575af2599c63e6513ddb7d1feff58

redfish-core/lib/log_services.hpp

diff --git a/redfish-core/lib/log_services.hpp b/redfish-core/lib/log_services.hpp
index 7be934e..c96a297 100644
--- a/redfish-core/lib/log_services.hpp
+++ b/redfish-core/lib/log_services.hpp
@@ -1462,8 +1462,11 @@
                                 {
                                     messages::internalError(asyncResp->res);
                                 }
-                                timestamp = crow::utility::getTimestamp(
-                                    *millisTimeStamp);
+                                else
+                                {
+                                    timestamp = crow::utility::getTimestamp(
+                                        *millisTimeStamp);
+                                }
                             }
                             else if (propertyMap.first == "UpdateTimestamp")
                             {
@@ -1473,8 +1476,12 @@
                                 {
                                     messages::internalError(asyncResp->res);
                                 }
-                                updateTimestamp = crow::utility::getTimestamp(
-                                    *millisTimeStamp);
+                                else
+                                {
+                                    updateTimestamp =
+                                        crow::utility::getTimestamp(
+                                            *millisTimeStamp);
+                                }
                             }
                             else if (propertyMap.first == "Severity")
                             {
@@ -1590,8 +1597,11 @@
                         {
                             messages::internalError(asyncResp->res);
                         }
-                        timestamp =
-                            crow::utility::getTimestamp(*millisTimeStamp);
+                        else
+                        {
+                            timestamp =
+                                crow::utility::getTimestamp(*millisTimeStamp);
+                        }
                     }
                     else if (propertyMap.first == "UpdateTimestamp")
                     {
@@ -1601,8 +1611,11 @@
                         {
                             messages::internalError(asyncResp->res);
                         }
-                        updateTimestamp =
-                            crow::utility::getTimestamp(*millisTimeStamp);
+                        else
+                        {
+                            updateTimestamp =
+                                crow::utility::getTimestamp(*millisTimeStamp);
+                        }
                     }
                     else if (propertyMap.first == "Severity")
                     {