diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-03-10 22:08:34 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-03-10 22:08:34 +0000 |
| commit | 30d3e09e6511630fed6f005202bb6e252f333a9b (patch) | |
| tree | 760625d856048373d82ecd71dfe46ad4f26ff853 /libjava | |
| parent | 267858a744be0cea0452bc2acbd3b1e95c57dfcf (diff) | |
| download | gcc-30d3e09e6511630fed6f005202bb6e252f333a9b.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@133094 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/classpath/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/classpath/native/jni/classpath/jcl.c | 4 | ||||
| -rw-r--r-- | libjava/gnu/classpath/natSystemProperties.cc | 3 |
4 files changed, 18 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index cbffc7c02c7..84ea6c0b3be 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -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. diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 1a39f6b48d5..c3d8f6395b6 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -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. diff --git a/libjava/classpath/native/jni/classpath/jcl.c b/libjava/classpath/native/jni/classpath/jcl.c index cd3f5161d06..0180ab9f0f5 100644 --- a/libjava/classpath/native/jni/classpath/jcl.c +++ b/libjava/classpath/native/jni/classpath/jcl.c @@ -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; diff --git a/libjava/gnu/classpath/natSystemProperties.cc b/libjava/gnu/classpath/natSystemProperties.cc index 089a14e5b4e..e259304b165 100644 --- a/libjava/gnu/classpath/natSystemProperties.cc +++ b/libjava/gnu/classpath/natSystemProperties.cc @@ -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); |