Skip to content

fix crash when plist filename hasn't suffix #19999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 5, 2019
Merged

fix crash when plist filename hasn't suffix #19999

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9630304
fix crash when plist filename hasn't suffix
dzj0821 Jul 31, 2019
220328b
fix typo
dzj0821 Aug 1, 2019
c4d79a3
maybe should continue instead of return
dzj0821 Aug 1, 2019
399b168
fix
dzj0821 Aug 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions cocos/2d/CCSpriteFrameCache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,10 @@ void SpriteFrameCache::addSpriteFramesWithFile(const std::string& plist)

// remove .xxx
size_t startPos = texturePath.find_last_of('.');
if(startPos != string::npos)
{
texturePath = texturePath.erase(startPos);
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will erase twice?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will erase twice?

sorry i forgot it, it was fixed in the last commit

texturePath = texturePath.erase(startPos);

// append .png
Expand Down Expand Up @@ -691,8 +695,10 @@ bool SpriteFrameCache::reloadTexture(const std::string& plist)

// remove .xxx
size_t startPos = texturePath.find_last_of('.');
texturePath = texturePath.erase(startPos);

if(startPos != string::npos)
{
texturePath = texturePath.erase(startPos);
}
// append .png
texturePath = texturePath.append(".png");
}
Expand Down