diff mbox series

[FFmpeg-devel,v2] lavu/mem: Make alloc array functions more similar to av_malloc

Message ID CAB0OVGqPbdgLKi_+Ah7eWPgo69x7fE0tsLh6bDfria0MJzcX-Q@mail.gmail.com
State Superseded
Headers show
Series [FFmpeg-devel,v2] lavu/mem: Make alloc array functions more similar to av_malloc | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate fail Make fate failed

Commit Message

Carl Eugen Hoyos April 11, 2020, 10:44 p.m. UTC 
Am So., 5. Apr. 2020 um 14:03 Uhr schrieb Michael Niedermayer
<michael@niedermayer.cc>:
>
> On Sat, Apr 04, 2020 at 12:46:36AM +0200, Carl Eugen Hoyos wrote:
> > Hi!
> >
> > Attached patch makes the alloc array functions more similar to
> > av_malloc, depending on max_alloc_size instead of INT_MAX.
> >
> > Allows a work-around for ticket #7140
> >
> > Please comment, Carl Eugen
>
> >  mem.c |    8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> > 507531ed6f0932834d005bc1dd7d18e762f158b2  0001-lavu-mem-Make-alloc-array-functions-more-similar-to-.patch
> > From 7ae240a9f7885130251031aba5d0764b11947fec Mon Sep 17 00:00:00 2001
> > From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> > Date: Sat, 4 Apr 2020 00:37:03 +0200
> > Subject: [PATCH] lavu/mem: Make alloc array functions more similar to
> >  av_malloc().
> >
> > Do not limit the array allocation functions to allocations of INT_MAX,
> > instead depend on max_alloc_size like av_malloc().
> >
> > Allows a workaround for ticket #7140.
> > ---
> >  libavutil/mem.c | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
>
> av_size_mult() may be faster

New patch attached.

> also we possibly should check somewhere for SIZE_MAX < INT_MAX
> for example in configure if we do not support such an oddity

Will send a patch once this one is ok.

Please comment, Carl Eugen

Comments

Carl Eugen Hoyos April 11, 2020, 11:53 p.m. UTC | #1 
Am So., 12. Apr. 2020 um 00:44 Uhr schrieb Carl Eugen Hoyos
<ceffmpeg@gmail.com>:
>
> Am So., 5. Apr. 2020 um 14:03 Uhr schrieb Michael Niedermayer
> <michael@niedermayer.cc>:
> >
> > On Sat, Apr 04, 2020 at 12:46:36AM +0200, Carl Eugen Hoyos wrote:
> > > Hi!
> > >
> > > Attached patch makes the alloc array functions more similar to
> > > av_malloc, depending on max_alloc_size instead of INT_MAX.
> > >
> > > Allows a work-around for ticket #7140
> > >
> > > Please comment, Carl Eugen
> >
> > >  mem.c |    8 ++++----
> > >  1 file changed, 4 insertions(+), 4 deletions(-)
> > > 507531ed6f0932834d005bc1dd7d18e762f158b2  0001-lavu-mem-Make-alloc-array-functions-more-similar-to-.patch
> > > From 7ae240a9f7885130251031aba5d0764b11947fec Mon Sep 17 00:00:00 2001
> > > From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> > > Date: Sat, 4 Apr 2020 00:37:03 +0200
> > > Subject: [PATCH] lavu/mem: Make alloc array functions more similar to
> > >  av_malloc().
> > >
> > > Do not limit the array allocation functions to allocations of INT_MAX,
> > > instead depend on max_alloc_size like av_malloc().
> > >
> > > Allows a workaround for ticket #7140.
> > > ---
> > >  libavutil/mem.c | 8 ++++----
> > >  1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > av_size_mult() may be faster
>
> New patch attached.

And an actually working variant.

Please comment, Carl Eugen
Michael Niedermayer April 12, 2020, 2:32 p.m. UTC | #2 
On Sun, Apr 12, 2020 at 01:53:51AM +0200, Carl Eugen Hoyos wrote:
> Am So., 12. Apr. 2020 um 00:44 Uhr schrieb Carl Eugen Hoyos
> <ceffmpeg@gmail.com>:
> >
> > Am So., 5. Apr. 2020 um 14:03 Uhr schrieb Michael Niedermayer
> > <michael@niedermayer.cc>:
> > >
> > > On Sat, Apr 04, 2020 at 12:46:36AM +0200, Carl Eugen Hoyos wrote:
> > > > Hi!
> > > >
> > > > Attached patch makes the alloc array functions more similar to
> > > > av_malloc, depending on max_alloc_size instead of INT_MAX.
> > > >
> > > > Allows a work-around for ticket #7140
> > > >
> > > > Please comment, Carl Eugen
> > >
> > > >  mem.c |    8 ++++----
> > > >  1 file changed, 4 insertions(+), 4 deletions(-)
> > > > 507531ed6f0932834d005bc1dd7d18e762f158b2  0001-lavu-mem-Make-alloc-array-functions-more-similar-to-.patch
> > > > From 7ae240a9f7885130251031aba5d0764b11947fec Mon Sep 17 00:00:00 2001
> > > > From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> > > > Date: Sat, 4 Apr 2020 00:37:03 +0200
> > > > Subject: [PATCH] lavu/mem: Make alloc array functions more similar to
> > > >  av_malloc().
> > > >
> > > > Do not limit the array allocation functions to allocations of INT_MAX,
> > > > instead depend on max_alloc_size like av_malloc().
> > > >
> > > > Allows a workaround for ticket #7140.
> > > > ---
> > > >  libavutil/mem.c | 8 ++++----
> > > >  1 file changed, 4 insertions(+), 4 deletions(-)
> > >
> > > av_size_mult() may be faster
> >
> > New patch attached.
> 
> And an actually working variant.
> 
> Please comment, Carl Eugen

>  mem.c |   20 ++++++++++++--------
>  1 file changed, 12 insertions(+), 8 deletions(-)
> 9be759276a25d6fa787286c3bce849486573266a  0001-lavu-mem-Make-alloc-array-functions-more-similar-to-.patch
> From 643c501d6698d7d17e47a9f907165649f1446fa6 Mon Sep 17 00:00:00 2001
> From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> Date: Sun, 12 Apr 2020 00:36:30 +0200
> Subject: [PATCH] lavu/mem: Make other alloc functions more similar to av_malloc().
> 
> Do not limit the array allocation functions and av_calloc() to allocations
> of INT_MAX, instead depend on max_alloc_size like av_malloc().
> 
> Allows a workaround for ticket #7140.
> ---
>  libavutil/mem.c | 20 ++++++++++++--------
>  1 file changed, 12 insertions(+), 8 deletions(-)

should be ok

thx

[...]
Carl Eugen Hoyos April 12, 2020, 8:34 p.m. UTC | #3 
Am So., 12. Apr. 2020 um 16:32 Uhr schrieb Michael Niedermayer
<michael@niedermayer.cc>:
>
> On Sun, Apr 12, 2020 at 01:53:51AM +0200, Carl Eugen Hoyos wrote:
> > Am So., 12. Apr. 2020 um 00:44 Uhr schrieb Carl Eugen Hoyos
> > <ceffmpeg@gmail.com>:
> > >
> > > Am So., 5. Apr. 2020 um 14:03 Uhr schrieb Michael Niedermayer
> > > <michael@niedermayer.cc>:
> > > >
> > > > On Sat, Apr 04, 2020 at 12:46:36AM +0200, Carl Eugen Hoyos wrote:
> > > > > Hi!
> > > > >
> > > > > Attached patch makes the alloc array functions more similar to
> > > > > av_malloc, depending on max_alloc_size instead of INT_MAX.
> > > > >
> > > > > Allows a work-around for ticket #7140
> > > > >
> > > > > Please comment, Carl Eugen
> > > >
> > > > >  mem.c |    8 ++++----
> > > > >  1 file changed, 4 insertions(+), 4 deletions(-)
> > > > > 507531ed6f0932834d005bc1dd7d18e762f158b2  0001-lavu-mem-Make-alloc-array-functions-more-similar-to-.patch
> > > > > From 7ae240a9f7885130251031aba5d0764b11947fec Mon Sep 17 00:00:00 2001
> > > > > From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> > > > > Date: Sat, 4 Apr 2020 00:37:03 +0200
> > > > > Subject: [PATCH] lavu/mem: Make alloc array functions more similar to
> > > > >  av_malloc().
> > > > >
> > > > > Do not limit the array allocation functions to allocations of INT_MAX,
> > > > > instead depend on max_alloc_size like av_malloc().
> > > > >
> > > > > Allows a workaround for ticket #7140.
> > > > > ---
> > > > >  libavutil/mem.c | 8 ++++----
> > > > >  1 file changed, 4 insertions(+), 4 deletions(-)
> > > >
> > > > av_size_mult() may be faster
> > >
> > > New patch attached.
> >
> > And an actually working variant.
> >
> > Please comment, Carl Eugen
>
> >  mem.c |   20 ++++++++++++--------
> >  1 file changed, 12 insertions(+), 8 deletions(-)
> > 9be759276a25d6fa787286c3bce849486573266a  0001-lavu-mem-Make-alloc-array-functions-more-similar-to-.patch
> > From 643c501d6698d7d17e47a9f907165649f1446fa6 Mon Sep 17 00:00:00 2001
> > From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> > Date: Sun, 12 Apr 2020 00:36:30 +0200
> > Subject: [PATCH] lavu/mem: Make other alloc functions more similar to av_malloc().
> >
> > Do not limit the array allocation functions and av_calloc() to allocations
> > of INT_MAX, instead depend on max_alloc_size like av_malloc().
> >
> > Allows a workaround for ticket #7140.
> > ---
> >  libavutil/mem.c | 20 ++++++++++++--------
> >  1 file changed, 12 insertions(+), 8 deletions(-)
>
> should be ok

Patch applied.

Thank you, Carl Eugen
diff mbox series

Patch

From 643c501d6698d7d17e47a9f907165649f1446fa6 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Date: Sun, 12 Apr 2020 00:36:30 +0200
Subject: [PATCH] lavu/mem: Make other alloc functions more similar to av_malloc().

Do not limit the array allocation functions and av_calloc() to allocations
of INT_MAX, instead depend on max_alloc_size like av_malloc().

Allows a workaround for ticket #7140.
---
 libavutil/mem.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/libavutil/mem.c b/libavutil/mem.c
index 88fe09b179..e044374c62 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -183,23 +183,26 @@  int av_reallocp(void *ptr, size_t size)
 
 void *av_malloc_array(size_t nmemb, size_t size)
 {
-    if (!size || nmemb >= INT_MAX / size)
+    size_t result;
+    if (av_size_mult(nmemb, size, &result) < 0 || !result)
         return NULL;
-    return av_malloc(nmemb * size);
+    return av_malloc(result);
 }
 
 void *av_mallocz_array(size_t nmemb, size_t size)
 {
-    if (!size || nmemb >= INT_MAX / size)
+    size_t result;
+    if (av_size_mult(nmemb, size, &result) < 0 || !result)
         return NULL;
-    return av_mallocz(nmemb * size);
+    return av_mallocz(result);
 }
 
 void *av_realloc_array(void *ptr, size_t nmemb, size_t size)
 {
-    if (!size || nmemb >= INT_MAX / size)
+    size_t result;
+    if (av_size_mult(nmemb, size, &result) < 0 || !result)
         return NULL;
-    return av_realloc(ptr, nmemb * size);
+    return av_realloc(ptr, result);
 }
 
 int av_reallocp_array(void *ptr, size_t nmemb, size_t size)
@@ -243,9 +246,10 @@  void *av_mallocz(size_t size)
 
 void *av_calloc(size_t nmemb, size_t size)
 {
-    if (size <= 0 || nmemb >= INT_MAX / size)
+    size_t result;
+    if (av_size_mult(nmemb, size, &result) < 0 || !result)
         return NULL;
-    return av_mallocz(nmemb * size);
+    return av_mallocz(result);
 }
 
 char *av_strdup(const char *s)
-- 
2.24.1