From: Jürg Billeter <j@bitron.ch>
Date: Sat, 2 Apr 2011 16:01:24 +0000 (+0200)
Subject: codegen: Fix array size variable on assignment
X-Git-Tag: 0.12.0~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4a2bd95c713714c0f7d8e7b53dfd8130416ab28;p=thirdparty%2Fvala.git

codegen: Fix array size variable on assignment

The array size of the right-hand side should not be used as the copy may
have a different size.

Fixes bug 646294.
---

diff --git a/codegen/valaccodeassignmentmodule.vala b/codegen/valaccodeassignmentmodule.vala
index 1bc79f271..ab9285b2e 100644
--- a/codegen/valaccodeassignmentmodule.vala
+++ b/codegen/valaccodeassignmentmodule.vala
@@ -199,11 +199,7 @@ public class Vala.CCodeAssignmentModule : CCodeMemberAccessModule {
 				}
 				if (array_type.rank == 1) {
 					if (get_array_size_cvalue (lvalue) != null) {
-						if (get_array_size_cvalue (value) != null) {
-							ccode.add_assignment (get_array_size_cvalue (lvalue), get_array_size_cvalue (value));
-						} else {
-							ccode.add_assignment (get_array_size_cvalue (lvalue), get_array_length_cvalue (value, 1));
-						}
+						ccode.add_assignment (get_array_size_cvalue (lvalue), get_array_length_cvalue (value, 1));
 					}
 				}
 			}