luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 14:06:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check for overflow when allocating RcBox

Browse Source 
Since we're over-allocating the passed block size, we need to check that
we're not overflowing gsize when computing the actual allocation size.
This commit is contained in:
Emmanuele Bassi 2018-07-03 15:55:24 +01:00
parent 7c4ac58938
commit 61ca2e4c85
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib/garcbox.c
View File

@ -18,10 +18,9 @@
#include "config.h" #include "config.h"
#include "grcbox.h" #include "grcboxprivate.h"
#include "gmessages.h" #include "gmessages.h"
#include "grcboxprivate.h"
#include "grefcount.h" #include "grefcount.h"
#ifdef ENABLE_VALGRIND #ifdef ENABLE_VALGRIND

10
glib/grcbox.c
View File

@ -18,11 +18,11 @@
#include "config.h" #include "config.h"
#include "grcbox.h" #include "grcboxprivate.h"
#include "gmessages.h" #include "gmessages.h"
#include "grcboxprivate.h"
#include "grefcount.h" #include "grefcount.h"
#include "gtestutils.h"
#ifdef ENABLE_VALGRIND #ifdef ENABLE_VALGRIND
#include "valgrind.h" #include "valgrind.h"
@ -173,9 +173,12 @@ g_rc_box_alloc_full (gsize block_size,
{ {
/* sizeof GArcBox == sizeof GRcBox */ /* sizeof GArcBox == sizeof GRcBox */
gsize private_size = G_ARC_BOX_SIZE; gsize private_size = G_ARC_BOX_SIZE;
gsize real_size = private_size + block_size; gsize real_size;
char *allocated; char *allocated;
g_assert (block_size < (G_MAXSIZE - G_ARC_BOX_SIZE));
real_size = private_size + block_size;
#ifdef ENABLE_VALGRIND #ifdef ENABLE_VALGRIND
if (RUNNING_ON_VALGRIND) if (RUNNING_ON_VALGRIND)
{ {
@ -185,6 +188,7 @@ g_rc_box_alloc_full (gsize block_size,
* Valgrind to keep track of the over-allocation and not be * Valgrind to keep track of the over-allocation and not be
* confused when passing the pointer around * confused when passing the pointer around
*/ */
g_assert (private_size < (G_MAXSIZE - ALIGN_STRUCT (1)));
private_size += ALIGN_STRUCT (1); private_size += ALIGN_STRUCT (1);
if (clear) if (clear)

1
glib/grcboxprivate.h
View File

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "gtypes.h" #include "gtypes.h"
#include "grcbox.h"
G_BEGIN_DECLS G_BEGIN_DECLS