diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-09-06 15:52:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-06 15:52:49 +0200 |
| commit | 1023fb6526fb716900f2c84bc3a4c7ea76576f74 (patch) | |
| tree | 399fd81ed3fadcd39d49919660dcafe0369e7151 /bundle-plugin | |
| parent | b61637400c4ed406a2e339347c9041dac24e71fb (diff) | |
| parent | e1ddb62cb85ed7bf6934e809870fa524701cef6a (diff) | |
Merge pull request #10540 from vespa-engine/jvenstad/fix-bundle-plugin-regex-overflow
Allow inner regex alternative of length >1 possessively MERGEOK
Diffstat (limited to 'bundle-plugin')
| -rw-r--r-- | bundle-plugin/src/main/java/com/yahoo/container/plugin/osgi/ExportPackageParser.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/osgi/ExportPackageParser.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/osgi/ExportPackageParser.java index 16858808a58..2a255fd9236 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/osgi/ExportPackageParser.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/osgi/ExportPackageParser.java @@ -140,7 +140,7 @@ public class ExportPackageParser { a backslash followed by another backslash, a single or double quote, or one of the letters b,f,n,r or t a backslash followed by u followed by four hexadecimal digits ? */ private static Pattern STRING_LITERAL_PATTERN = Pattern - .compile("\"" + "(?:[^\"\\p{Cntrl}\\\\]|\\\\[\\\\'\"bfnrt]|\\\\u[0-9a-fA-F]{4})+" + "\""); + .compile("\"(?:[^\"\\p{Cntrl}\\\\]+|\\\\[\\\\'\"bfnrt]|\\\\u[0-9a-fA-F]{4})+\""); private static Optional<String> parseStringLiteral(ParsingContext p) { return p.regexp(STRING_LITERAL_PATTERN).map(quoted -> quoted.substring(1, quoted.length() - 1)); |