29 lines
733 B
Diff
29 lines
733 B
Diff
|
|
||
|
|
---
|
||
|
|
tools/lib/subcmd/subcmd-util.h | 9 ++++-----
|
||
|
|
1 file changed, 4 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tools/lib/subcmd/subcmd-util.h b/tools/lib/subcmd/subcmd-util.h
|
||
|
|
index 794a375dad36..7009fc176636 100644
|
||
|
|
--- a/tools/lib/subcmd/subcmd-util.h
|
||
|
|
+++ b/tools/lib/subcmd/subcmd-util.h
|
||
|
|
@@ -49,13 +49,12 @@ static NORETURN inline void die(const char *err, ...)
|
||
|
|
|
||
|
|
static inline void *xrealloc(void *ptr, size_t size)
|
||
|
|
{
|
||
|
|
- void *ret = realloc(ptr, size);
|
||
|
|
- if (!ret && !size)
|
||
|
|
- ret = realloc(ptr, 1);
|
||
|
|
+ void *ret;
|
||
|
|
+ if (!size)
|
||
|
|
+ size = 1;
|
||
|
|
+ ret = realloc(ptr, size);
|
||
|
|
if (!ret) {
|
||
|
|
ret = realloc(ptr, size);
|
||
|
|
- if (!ret && !size)
|
||
|
|
- ret = realloc(ptr, 1);
|
||
|
|
if (!ret)
|
||
|
|
die("Out of memory, realloc failed");
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.34.1
|