|
|
199d345 |
diff -up lastpass-cli-1.3.1/util.c.remove_reallocarray lastpass-cli-1.3.1/util.c
|
|
|
199d345 |
--- lastpass-cli-1.3.1/util.c.remove_reallocarray 2018-05-17 11:42:27.000000000 +0200
|
|
|
199d345 |
+++ lastpass-cli-1.3.1/util.c 2018-07-03 20:14:34.347554160 +0200
|
|
|
199d345 |
@@ -196,19 +196,6 @@ void *xrealloc(void *ptr, size_t size)
|
|
|
199d345 |
return ret;
|
|
|
199d345 |
die_errno("realloc(%p, %zu)", ptr, size);
|
|
|
199d345 |
}
|
|
|
199d345 |
-void *reallocarray(void *optr, size_t nmemb, size_t size)
|
|
|
199d345 |
-{
|
|
|
199d345 |
- if (!size || !nmemb) {
|
|
|
199d345 |
- errno = ENOMEM;
|
|
|
199d345 |
- return NULL;
|
|
|
199d345 |
- }
|
|
|
199d345 |
- if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
|
|
|
199d345 |
- nmemb > 0 && SIZE_MAX / nmemb < size) {
|
|
|
199d345 |
- errno = ENOMEM;
|
|
|
199d345 |
- return NULL;
|
|
|
199d345 |
- }
|
|
|
199d345 |
- return realloc(optr, size * nmemb);
|
|
|
199d345 |
-}
|
|
|
199d345 |
void *xreallocarray(void *ptr, size_t nmemb, size_t size)
|
|
|
199d345 |
{
|
|
|
199d345 |
void *ret = reallocarray(ptr, nmemb, size);
|
|
|
199d345 |
diff -up lastpass-cli-1.3.1/util.h.remove_reallocarray lastpass-cli-1.3.1/util.h
|
|
|
199d345 |
--- lastpass-cli-1.3.1/util.h.remove_reallocarray 2018-05-17 11:42:27.000000000 +0200
|
|
|
199d345 |
+++ lastpass-cli-1.3.1/util.h 2018-07-03 20:14:13.644661155 +0200
|
|
|
199d345 |
@@ -64,7 +64,6 @@ bool ask_yes_no(bool default_yes, const
|
|
|
199d345 |
void *xmalloc(size_t size);
|
|
|
199d345 |
void *xcalloc(size_t nmemb, size_t size);
|
|
|
199d345 |
void *xrealloc(void *ptr, size_t size);
|
|
|
199d345 |
-void *reallocarray(void *ptr, size_t nmemb, size_t size);
|
|
|
199d345 |
void *xreallocarray(void *ptr, size_t nmemb, size_t size);
|
|
|
199d345 |
|
|
|
199d345 |
void *xstrdup(const char *str);
|