jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-14 10:04:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix regression in #4762 to _fill_with_ template (#5083)

Browse source 
fixes #5062
This commit is contained in:
ebbit1q 2024-07-29 03:20:50 +02:00 • committed by GitHub
parent c5bb38e907
commit ef4413633a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cockatrice/src/pictureloader.cpp
View file

@ -284,16 +284,18 @@ static int parse(const QString &urlTemplate,
return 1; return 1;
} else { } else {
int propLength = propertyValue.length(); int propLength = propertyValue.length();
if (subStrLen > 0 && subStrPos + subStrLen > propLength) { if (subStrLen > 0) {
if (subStrPos + subStrLen > propLength) {
qDebug().nospace() << "PictureLoader: [card: " << cardName << " set: " << setName << "]: Requested " qDebug().nospace() << "PictureLoader: [card: " << cardName << " set: " << setName << "]: Requested "
<< propType << " property (" << cardPropertyName << ") for Url template (" << propType << " property (" << cardPropertyName << ") for Url template ("
<< urlTemplate << ") is smaller than substr specification (" << subStrPos << " + " << urlTemplate << ") is smaller than substr specification (" << subStrPos
<< subStrLen << " > " << propLength << ")"; << " + " << subStrLen << " > " << propLength << ")";
return 1; return 1;
} else { } else {
propertyValue = propertyValue.mid(subStrPos, subStrLen); propertyValue = propertyValue.mid(subStrPos, subStrLen);
propLength = subStrLen; propLength = subStrLen;
} }
}
if (!fillWith.isEmpty()) { if (!fillWith.isEmpty()) {
int fillLength = fillWith.length(); int fillLength = fillWith.length();