Merge pull request #7907 from cniethammer/null_pointer_arithmetic_fix

jsquyres · web-flow · commit a7ed13d74a84 · 2020-07-06T07:04:56.000-04:00
Fix null pointer arithmetic resulting in potential undefined behavior
diff --git a/opal/class/opal_free_list.c b/opal/class/opal_free_list.c
@@ -272,7 +272,9 @@ int opal_free_list_grow_st (opal_free_list_t* flist, size_t num_elements, opal_f
         }
 
         ptr += head_size;
-        payload_ptr += elem_size;
+        if (NULL != payload_ptr) {
+            payload_ptr += elem_size;
+        }
     }
 
     if (OPAL_SUCCESS != rc && 0 == num_elements) {

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,9 @@ int opal_free_list_grow_st (opal_free_list_t* flist, size_t num_elements, opal_f`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`ptr += head_size;`
`275`		`- payload_ptr += elem_size;`
	`275`	`+ if (NULL != payload_ptr) {`
	`276`	`+ payload_ptr += elem_size;`
	`277`	`+ }`
`276`	`278`	`}`
`277`	`279`
`278`	`280`	`if (OPAL_SUCCESS != rc && 0 == num_elements) {`