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

prims.cc (next_property_value): Never return NULL. 

* prims.cc (next_property_value): Never return NULL.
	(process_gcj_properties): Copy 'props' before using it.

Co-Authored-By: Tom Tromey <tromey@redhat.com>

From-SVN: r110177
This commit is contained in:
Archit Shah 2006-01-24 18:10:39 +00:00 committed by Tom Tromey
parent c41303c681
commit 38fd6679a3
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2006-01-24 Archit Shah <ashah@redhat.com>
Tom Tromey <tromey@redhat.com>
* prims.cc (next_property_value): Never return NULL.
(process_gcj_properties): Copy 'props' before using it.
2006-01-23 Keith Seitz <keiths@redhat.com>
* java/lang/Class.h (_Jv_FindInterpreterMethod): Add new declaration.

15
libjava/prims.cc
View File

@ -857,10 +857,6 @@ next_property_value (char *s, size_t *length)
while (isspace (*s))
s++;
// If we've reached the end, return NULL.
if (*s == 0)
return NULL;
// Determine the length of the property value.
while (s[l] != 0
&& ! isspace (s[l])
@ -883,13 +879,18 @@ static void
process_gcj_properties ()
{
char *props = getenv("GCJ_PROPERTIES");
char *p = props;
size_t length;
size_t property_count = 0;
if (NULL == props)
return;
// Later on we will write \0s into this string. It is simplest to
// just duplicate it here.
props = strdup (props);
char *p = props;
size_t length;
size_t property_count = 0;
// Whip through props quickly in order to count the number of
// property values.
while (p && (p = next_property_key (p, &length)))