prevent modifying vector after in-place conversion to string

part of #24388
JuliaLang · Dec 30, 2017 · 1cae074 · 1cae074
1 parent 6e9476b
commit 1cae074
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/array.c b/src/array.c
@@ -441,6 +441,11 @@ JL_DLLEXPORT jl_value_t *jl_array_to_string(jl_array_t *a)
         if (jl_is_string(o)) {
             a->flags.isshared = 1;
             *(size_t*)o = jl_array_len(a);
+            a->nrows = 0;
+#ifdef STORE_ARRAY_LEN
+            a->length = 0;
+#endif
+            a->maxsize = 0;
             return o;
         }
     }

diff --git a/test/strings/basic.jl b/test/strings/basic.jl
@@ -794,3 +794,11 @@ end
 @test nextind("\xf8\x9f\x98\x84", 1) == 2
 @test next("\xf8\x9f\x98\x84z", 1)[2] == 2
 @test nextind("\xf8\x9f\x98\x84z", 1) == 2
+
+# issue #24388
+let v = unsafe_wrap(Vector{UInt8}, "abc")
+    s = String(v)
+    @test_throws BoundsError v[1]
+    push!(v, UInt8('x'))
+    @test s == "abc"
+end