OOM: avoid warn when calling *alloc(0) (esp8266#7909)

d-a-v · web-flow · commit 9fc5afd5fde9 · 2021-03-04T13:27:42.000-08:00
diff --git a/cores/esp8266/heap.cpp b/cores/esp8266/heap.cpp
@@ -194,8 +194,8 @@ void ICACHE_RAM_ATTR print_oom_size(size_t size)
     }
 }
 
-#define OOM_CHECK__PRINT_OOM(p, s) if (!p) print_oom_size(s)
-#define OOM_CHECK__PRINT_LOC(p, s, f, l) if (!p) print_loc(s, f, l)
+#define OOM_CHECK__PRINT_OOM(p, s) if ((s) && !(p)) print_oom_size(s)
+#define OOM_CHECK__PRINT_LOC(p, s, f, l) if ((s) && !(p)) print_loc(s, f, l)
 
 #else  // ! DEBUG_ESP_OOM
 

Original file line number	Diff line number	Diff line change
`@@ -194,8 +194,8 @@ void ICACHE_RAM_ATTR print_oom_size(size_t size)`
`194`	`194`	`}`
`195`	`195`	`}`
`196`	`196`
`197`		`-#define OOM_CHECK__PRINT_OOM(p, s) if (!p) print_oom_size(s)`
`198`		`-#define OOM_CHECK__PRINT_LOC(p, s, f, l) if (!p) print_loc(s, f, l)`
	`197`	`+#define OOM_CHECK__PRINT_OOM(p, s) if ((s) && !(p)) print_oom_size(s)`
	`198`	`+#define OOM_CHECK__PRINT_LOC(p, s, f, l) if ((s) && !(p)) print_loc(s, f, l)`
`199`	`199`
`200`	`200`	`#else // ! DEBUG_ESP_OOM`
`201`	`201`