Fix a bug that the glob pattern parser falls in an infinite loop for invalid patterns.

llvm-svn: 290160

diff --git a/lld/ELF/Strings.cpp b/lld/ELF/Strings.cpp
index 349325c..47752a6 100644 (file)
--- a/lld/ELF/Strings.cpp
+++ b/lld/ELF/Strings.cpp
@@ -39,6 +39,7 @@ BitVector GlobPattern::scan(StringRef &S) {
     size_t End = S.find(']', 1);
     if (End == StringRef::npos) {
       error("invalid glob pattern: " + Original);
+      S = "";
       return BitVector(256, false);
     }
     StringRef Chars = S.substr(1, End - 1);

diff --git a/lld/test/ELF/version-script-complex-wildcards.s b/lld/test/ELF/version-script-complex-wildcards.s
index 8291c25..61e1069 100644 (file)
--- a/lld/test/ELF/version-script-complex-wildcards.s
+++ b/lld/test/ELF/version-script-complex-wildcards.s
@@ -45,6 +45,11 @@
 # RUN: ld.lld --version-script %t8.script -shared %t.o -o %t8.so
 # RUN: llvm-readobj -V %t8.so | FileCheck %s --check-prefix=ABBABC
 
+# RUN: echo "FOO { global: extern \"C++\" { a[; }; };" > %t9.script
+# RUN: not ld.lld --version-script %t9.script -shared %t.o -o %t9.so 2>&1 \
+# RUN:   | FileCheck %s --check-prefix=ERROR
+# ERROR: invalid glob pattern: a[
+
 .text
 .globl _Z3abci
 .type _Z3abci,@function