OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b634b36
)
mem: Do not check unsigned values for negative size
author
Diego Biurrun
<diego@biurrun.de>
Wed, 4 Sep 2013 10:28:01 +0000
(12:28 +0200)
committer
Diego Biurrun
<diego@biurrun.de>
Thu, 5 Sep 2013 10:38:43 +0000
(12:38 +0200)
libavutil/mem.c
patch
|
blob
|
history
diff --git
a/libavutil/mem.c
b/libavutil/mem.c
index
b4a190a
..
5f64f56
100644
(file)
--- a/
libavutil/mem.c
+++ b/
libavutil/mem.c
@@
-138,7
+138,7
@@
void *av_realloc(void *ptr, size_t size)
void *av_realloc_array(void *ptr, size_t nmemb, size_t size)
{
- if (
size <= 0
|| nmemb >= INT_MAX / size)
+ if (
!size
|| nmemb >= INT_MAX / size)
return NULL;
return av_realloc(ptr, nmemb * size);
}
@@
-147,9
+147,9
@@
int av_reallocp_array(void *ptr, size_t nmemb, size_t size)
{
void **ptrptr = ptr;
void *ret;
- if (
size <= 0
|| nmemb >= INT_MAX / size)
+ if (
!size
|| nmemb >= INT_MAX / size)
return AVERROR(ENOMEM);
- if (
nmemb <= 0
) {
+ if (
!nmemb
) {
av_freep(ptr);
return 0;
}