commit b54966c7d211848cfed7884a5b92fb2f159a2526
author Herb Derby <herb@google.com> Thu Oct 06 18:46:46 2022 +0000
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Thu Oct 06 18:49:09 2022 +0000
tree 2b863be9c3d37e6f66411c1cb52f4d92302a347d
parent 655489cafa5670d54e647a0b0e3c34dd7c0884a4

Revert "Remove guard protecting free in sk_free"

This reverts commit 6452da9b7f7acf3864e3fd07005509678406e19a.

Reason for revert: Slows down multiple tests on multiple platforms

Checked by hand on an M1 mac.

Original change's description:
> Remove guard protecting free in sk_free
>
> C++ specifies that free should handle nullptrs.
>
> Change-Id: Icf49787a787a5a8f79966d6dd58676930e46c0b0
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/588037
> Commit-Queue: Herb Derby <herb@google.com>
> Reviewed-by: John Stiles <johnstiles@google.com>

Change-Id: I9cb3e25e36a81b2e5d039aa76379ad79d4049d6d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/588577
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Herb Derby <herb@google.com>

src/ports/SkMemory_malloc.cpp

diff --git a/src/ports/SkMemory_malloc.cpp b/src/ports/SkMemory_malloc.cpp
index 7b5e9c6..49dafdb 100644
--- a/src/ports/SkMemory_malloc.cpp
+++ b/src/ports/SkMemory_malloc.cpp
@@ -69,7 +69,9 @@
 }
 
 void sk_free(void* p) {
-    free(p);
+    if (p) {
+        free(p);
+    }
 }
 
 void* sk_malloc_flags(size_t size, unsigned flags) {