MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

move check before expand — expanded file path could contain "$...$"

Browse Source
This commit is contained in:
Vladimir Krivosheev
2014-09-05 09:40:05 +02:00
parent cc53bf0022
commit e1719a15f6
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StateStorageManagerImpl.java
+8 -12
View File
@@ -335,22 +335,18 @@ public abstract class StateStorageManagerImpl implements StateStorageManager, Di
@Override
@NotNull
public synchronized String expandMacros(@NotNull String file) {
Matcher matcher = MACRO_PATTERN.matcher(file);
while (matcher.find()) {
String m = matcher.group(1);
if (!myMacros.containsKey(m)) {
throw new IllegalArgumentException("Unknown macro: " + m + " in storage file spec: " + file);
}
}
String expanded = file;
for (String macro : myMacros.keySet()) {
expanded = StringUtil.replace(expanded, macro, myMacros.get(macro));
}
// PHP tests use $ as part of name and resulting project name will contain macros-like string
if (!ApplicationManager.getApplication().isUnitTestMode()) {
final Matcher matcher = MACRO_PATTERN.matcher(expanded);
while (matcher.find()) {
String m = matcher.group(1);
if (m != null && !myMacros.containsKey(m)) {
throw new IllegalArgumentException("Unknown macro: " + m + " in storage file spec: " + file);
}
}
}
return expanded;
}