fixed bug #1431593 - dir_reader::matches uses iterator that is at end
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4522 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
bb93a15df6
commit
940af5f963
1 changed files with 6 additions and 6 deletions
|
@ -57,13 +57,13 @@ bool dir_reader::matches(const string& name, const string& spec) {
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case '*':
|
case '*':
|
||||||
// double asterisk is the same as a simgle asterisk
|
// double asterisk is the same as a single asterisk
|
||||||
while (*spec_itr == '*' && spec_itr != spec_end)
|
while (*spec_itr == '*') {
|
||||||
spec_itr++;
|
spec_itr++;
|
||||||
|
// asterisk at the end of the spec matches the end of the name
|
||||||
// asterisk at the end of the spec matches the end of the name
|
if (spec_itr == spec_end)
|
||||||
if (spec_itr == spec_end)
|
return true;
|
||||||
return true;
|
}
|
||||||
|
|
||||||
// remember last good name and spec for prematurely stopped asterisk
|
// remember last good name and spec for prematurely stopped asterisk
|
||||||
last_good_spec = spec_itr;
|
last_good_spec = spec_itr;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue