OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't leak upon failed realloc.

Browse Source 
libjava
2008-03-10  Jim Meyering  <meyering@redhat.com>
        Don't leak upon failed realloc.
        * gnu/classpath/natSystemProperties.cc
        (SystemProperties::insertSystemProperties):
libjava/classpath
2008-03-10  Jim Meyering  <meyering@redhat.com>
        Don't leak upon failed realloc.
        * native/jni/classpath/jcl.c (JCL_realloc): Upon failed realloc,
        free the original buffer before throwing the exception.

From-SVN: r133094
This commit is contained in:
Jim Meyering 2008-03-10 22:08:34 +00:00 committed by Tom Tromey
parent dd6d523630
commit ea1b8c8764
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2008-03-10 Jim Meyering <meyering@redhat.com>
Don't leak upon failed realloc.
* gnu/classpath/natSystemProperties.cc
(SystemProperties::insertSystemProperties):
2008-03-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* HACKING: Fix grep patterns.

6
libjava/classpath/ChangeLog
View File

@ -1,3 +1,9 @@
2008-03-10 Jim Meyering <meyering@redhat.com>
Don't leak upon failed realloc.
* native/jni/classpath/jcl.c (JCL_realloc): Upon failed realloc,
free the original buffer before throwing the exception.
2008-03-09 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* doc/cp-hacking.texinfo: Fix spacing after periods.

4
libjava/classpath/native/jni/classpath/jcl.c
View File

@ -1,5 +1,5 @@
/* jcl.c
Copyright (C) 1998, 2005, 2006 Free Software Foundation, Inc.
Copyright (C) 1998, 2005, 2006, 2008 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -152,9 +152,11 @@ JCL_malloc (JNIEnv * env, size_t size)
JNIEXPORT void *JNICALL
JCL_realloc (JNIEnv * env, void *ptr, size_t size)
{
void *orig_ptr = ptr;
ptr = realloc (ptr, size);
if (ptr == 0)
{
free (orig_ptr);
JCL_ThrowException (env, "java/lang/OutOfMemoryError",
"malloc() failed.");
return NULL;

3
libjava/gnu/classpath/natSystemProperties.cc
View File

@ -270,7 +270,10 @@ gnu::classpath::SystemProperties::insertSystemProperties (::java::util::Properti
if (errno != ERANGE)
break;
buflen = 2 * buflen;
char *orig_buf = buffer;
buffer = (char *) realloc (buffer, buflen);
if (buffer == NULL)
free (orig_buf);
}
if (buffer != NULL)
free (buffer);