summaryrefslogtreecommitdiff
path: root/glib/gmem.c
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2010-07-21 16:08:19 -0400
committerBehdad Esfahbod <behdad@behdad.org>2010-07-21 16:11:35 -0400
commit8f80ff02af2fabd22d5aac1d1b853d1ac7865e85 (patch)
tree9450b8572405c63c3e5a8621c1ca3c6a51a94f09 /glib/gmem.c
parent5063d78baac684a1c53a6a1620ff94789026ae26 (diff)
downloadglib-8f80ff02af2fabd22d5aac1d1b853d1ac7865e85.tar.gz
Bug 624968 - div by zero in g_malloc_n family
Diffstat (limited to 'glib/gmem.c')
-rw-r--r--glib/gmem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/glib/gmem.c b/glib/gmem.c
index 1e92ffd19..2c9b74a18 100644
--- a/glib/gmem.c
+++ b/glib/gmem.c
@@ -263,7 +263,7 @@ g_try_realloc (gpointer mem,
}
-#define SIZE_OVERFLOWS(a,b) (G_UNLIKELY ((a) > G_MAXSIZE / (b)))
+#define SIZE_OVERFLOWS(a,b) (G_UNLIKELY ((b) > 0 && (a) > G_MAXSIZE / (b)))
gpointer
g_malloc_n (gsize n_blocks,