From: Florian Krohm <florian@eich-krohm.de>
Date: Fri, 6 Feb 2015 20:25:57 +0000 (+0000)
Subject: There must be at least one element in a VLA.
X-Git-Tag: svn/VALGRIND_3_11_0~680
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a3d3886322a51a89e129b10b507f0f7db747880;p=thirdparty%2Fvalgrind.git

There must be at least one element in a VLA.
Found by libubsan.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14912
---

diff --git a/coregrind/m_demangle/cp-demangle.c b/coregrind/m_demangle/cp-demangle.c
index 3489e75415..e311e3f5e3 100644
--- a/coregrind/m_demangle/cp-demangle.c
+++ b/coregrind/m_demangle/cp-demangle.c
@@ -4071,8 +4071,8 @@ cplus_demangle_print_callback (int options,
 
   {
 #ifdef CP_DYNAMIC_ARRAYS
-    __extension__ struct d_saved_scope scopes[dpi.num_saved_scopes];
-    __extension__ struct d_print_template temps[dpi.num_copy_templates];
+    __extension__ struct d_saved_scope scopes[dpi.num_saved_scopes ?: 1];
+    __extension__ struct d_print_template temps[dpi.num_copy_templates ?: 1];
 
     dpi.saved_scopes = scopes;
     dpi.copy_templates = temps;