commit fa7f7ac43e8fa3a7519ebf57834d032eb3f8c7b1
author Jonathan Peyton <jonathan.l.peyton@intel.com> Mon Mar 11 10:27:31 2024 -0500
committer Copybara-Service <copybara-worker@google.com> Mon Mar 11 08:32:52 2024 -0700
tree 419dd4115da9d1c47f9c2548819b7a38daebb626
parent 266e23ec9d2c87efe3d146ccc6e036d03cd7fdac

[OpenMP] Make sure ptr is used after NULL check (#83304)

GitOrigin-RevId: 1ed463d9617324c37d7efe117233f68f794ac619

runtime/src/kmp_settings.cpp

diff --git a/runtime/src/kmp_settings.cpp b/runtime/src/kmp_settings.cpp
index abca4d2..b9c8289 100644
--- a/runtime/src/kmp_settings.cpp
+++ b/runtime/src/kmp_settings.cpp
@@ -4373,8 +4373,8 @@
                                          void *data) {
   size_t length;
   const char *ptr = value;
-  SKIP_WS(ptr);
-  if (value) {
+  if (ptr) {
+    SKIP_WS(ptr);
     length = KMP_STRLEN(value);
     if (length) {
       if (value[length - 1] == '"' || value[length - 1] == '\'')

runtime/src/kmp_threadprivate.cpp

diff --git a/runtime/src/kmp_threadprivate.cpp b/runtime/src/kmp_threadprivate.cpp
index b79ac7d..c4a1ec6 100644
--- a/runtime/src/kmp_threadprivate.cpp
+++ b/runtime/src/kmp_threadprivate.cpp
@@ -248,16 +248,16 @@
         if (d_tn->is_vec) {
           if (d_tn->dt.dtorv != 0) {
             (void)(*d_tn->dt.dtorv)(tn->par_addr, d_tn->vec_len);
-          }
-          if (d_tn->obj_init != 0) {
-            (void)(*d_tn->dt.dtorv)(d_tn->obj_init, d_tn->vec_len);
+            if (d_tn->obj_init != 0) {
+              (void)(*d_tn->dt.dtorv)(d_tn->obj_init, d_tn->vec_len);
+            }
           }
         } else {
           if (d_tn->dt.dtor != 0) {
             (void)(*d_tn->dt.dtor)(tn->par_addr);
-          }
-          if (d_tn->obj_init != 0) {
-            (void)(*d_tn->dt.dtor)(d_tn->obj_init);
+            if (d_tn->obj_init != 0) {
+              (void)(*d_tn->dt.dtor)(d_tn->obj_init);
+            }
           }
         }
       }