vala: Do not allow to .resize() on arrays with fixed length

sailfishos-mirror · Oct 30, 2019 · 030093b · 030093b
1 parent 67d8e3f
commit 030093b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -76,6 +76,7 @@ TESTS = \
 	arrays/field-global-length-cname.vala \
 	arrays/fixed-length-concat-invalid.test \
 	arrays/fixed-length-non-const.test \
+	arrays/fixed-length-resize-invalid.test \
 	arrays/struct-field-length-cname.vala \
 	arrays/incompatible-integer-elements.test \
 	arrays/slice-invalid-start.test \

diff --git a/tests/arrays/fixed-length-resize-invalid.test b/tests/arrays/fixed-length-resize-invalid.test
@@ -0,0 +1,6 @@
+Invalid Code
+
+void main () {
+	int foo[2] = { 23, 42 };
+	foo.resize (3);
+}
diff --git a/vala/valamemberaccess.vala b/vala/valamemberaccess.vala
@@ -447,6 +447,14 @@ public class Vala.MemberAccess : Expression {
 					may_access_klass_members = true;
 				}
 			}
+
+			if (symbol_reference is ArrayResizeMethod && inner.value_type is ArrayType) {
+				unowned ArrayType? value_array_type = inner.value_type as ArrayType;
+				if (value_array_type != null && value_array_type.inline_allocated) {
+					Report.error (source_reference, "`resize' is not supported for arrays with fixed length");
+					error = true;
+				}
+			}
 		}
 
 		// enum-type inference