From: bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 20 Jul 2004 15:36:56 +0000 (+0000)
Subject: 2004-07-19  Bryce McKinlay  <mckinlay@redhat.com>
X-Git-Tag: upstream/4.9.2~69367
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2986815f9057118d71ee52f6803161b67b67d52b;p=platform%2Fupstream%2Flinaro-gcc.git

2004-07-19  Bryce McKinlay  <mckinlay@redhat.com>

	* prims.cc (process_gcj_properties): Don't increment i within LHS
	of assignment.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@84957 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8f7edb1..07810e4 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-19  Bryce McKinlay  <mckinlay@redhat.com>
+
+	* prims.cc (process_gcj_properties): Don't increment i within LHS
+	of assignment.
+
 2004-07-19  Per Bothner  <per@bothner.com>
 
 	Print -verbose:message on "loading", not initialization.
diff --git a/libjava/prims.cc b/libjava/prims.cc
index 19bce1e..ca8265f 100644
--- a/libjava/prims.cc
+++ b/libjava/prims.cc
@@ -922,8 +922,10 @@ process_gcj_properties ()
     // Null terminate the strings.
     while (_Jv_Environment_Properties[i].key)
       {
-	_Jv_Environment_Properties[i].key[_Jv_Environment_Properties[i].key_length] = 0;
-	_Jv_Environment_Properties[i++].value[_Jv_Environment_Properties[i].value_length] = 0;
+        property_pair *prop = &_Jv_Environment_Properties[i];
+	prop->key[prop->key_length] = 0;
+	prop->value[prop->value_length] = 0;
+	i++;
       }
   }
 }