Skip to content

fix: reject invalid image resource ids #5

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

Open
tonycoder-hub wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: reject invalid image resource ids #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions frameworks/core/image/image_loader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

#include "core/image/image_loader.h"

#include <charconv>

#include "drawing/engine_adapter/skia_adapter/skia_data.h"
#include "utils/data.h"
#ifdef USE_NEW_SKIA
Expand Down Expand Up @@ -60,6 +62,14 @@ const std::regex MEDIA_APP_RES_ID_REGEX(R"(^resource://.*/([0-9]+)\.\w+$)", std:
const std::regex MEDIA_RES_NAME_REGEX(R"(^resource://.*/(\w+)\.\w+$)", std::regex::icase);
constexpr uint32_t MEDIA_RESOURCE_MATCH_SIZE = 2;

bool ParseResourceId(const std::string &value, uint32_t &resourceId)
{
const char *begin = value.data();
const char *end = begin + value.size();
auto parsed = std::from_chars(begin, end, resourceId);
return parsed.ec == std::errc{} && parsed.ptr == end;
}

const std::chrono::duration<int, std::milli> TIMEOUT_DURATION(10000);

#ifdef WINDOWS_PLATFORM
Expand Down Expand Up @@ -644,8 +654,7 @@ bool ResourceImageLoader::GetResourceId(const std::string& uri, uint32_t& resId)
matches[1].length(), uri.c_str());
return false;
}
resId = static_cast<uint32_t>(std::stoul(matches[1].str()));
return true;
return ParseResourceId(matches[1].str(), resId);
}

std::smatch appMatches;
Expand All @@ -656,8 +665,7 @@ bool ResourceImageLoader::GetResourceId(const std::string& uri, uint32_t& resId)
appMatches[1].length(), uri.c_str());
return false;
}
resId = static_cast<uint32_t>(std::stoul(appMatches[1].str()));
return true;
return ParseResourceId(appMatches[1].str(), resId);
}

return false;
Expand Down