mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Check ReferencesParent before calling MakeAbsoluteFilePath

Browse source
This commit is contained in:
Kevin Sawicki 2016-03-07 09:35:35 -08:00
parent 7692edf50e
commit 9c88a5c1ab
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
atom/common/api/atom_api_native_image.cc
View file

@ -120,6 +120,20 @@ bool PopulateImageSkiaRepsFromPath(gfx::ImageSkia* image,
return succeed; return succeed;
} }
base::FilePath MakePathAbsolute(const base::FilePath& path) {
if (!path.ReferencesParent()) {
return path;
}
base::FilePath absolute_path = MakeAbsoluteFilePath(path);
// MakeAbsoluteFilePath returns an empty path on failures so use original path
if (absolute_path.empty()) {
return path;
} else {
return absolute_path;
}
}
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
bool IsTemplateFilename(const base::FilePath& path) { bool IsTemplateFilename(const base::FilePath& path) {
return (base::MatchPattern(path.value(), "*Template.*") || return (base::MatchPattern(path.value(), "*Template.*") ||
@ -255,12 +269,7 @@ mate::Handle<NativeImage> NativeImage::CreateFromJPEG(
mate::Handle<NativeImage> NativeImage::CreateFromPath( mate::Handle<NativeImage> NativeImage::CreateFromPath(
v8::Isolate* isolate, const base::FilePath& path) { v8::Isolate* isolate, const base::FilePath& path) {
gfx::ImageSkia image_skia; gfx::ImageSkia image_skia;
base::FilePath absolute_path = MakePathAbsolute(path);
base::FilePath absolute_path = MakeAbsoluteFilePath(path);
// MakeAbsoluteFilePath returns an empty path on failures so use original path
if (absolute_path.empty()) {
absolute_path = path;
}
if (absolute_path.MatchesExtension(FILE_PATH_LITERAL(".ico"))) { if (absolute_path.MatchesExtension(FILE_PATH_LITERAL(".ico"))) {
#if defined(OS_WIN) #if defined(OS_WIN)