mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-16 17:22:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Avoid accessing NULL pointer

Browse Source
This commit is contained in:
Chris Young 2015-08-24 18:00:24 +01:00
parent cba6bdb481
commit 4bbf2ac58a
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
amiga/gui.c
View File

@ -346,13 +346,14 @@ bool ami_locate_resource(char *fullpath, const char *file)
/* Check NetSurf user data area first */
strcpy(fullpath, current_user_dir);
found = ami_gui_check_resource(fullpath, file);
if(found) return true;
if(current_user_dir != NULL) {
strcpy(fullpath, current_user_dir);
found = ami_gui_check_resource(fullpath, file);
if(found) return true;
}
/* Check current theme directory */
if(nsoption_charp(theme))
{
if(nsoption_charp(theme)) {
strcpy(fullpath, nsoption_charp(theme));
found = ami_gui_check_resource(fullpath, file);
if(found) return true;
@ -362,28 +363,23 @@ bool ami_locate_resource(char *fullpath, const char *file)
locale = OpenLocale(NULL);
for(i=0;i<10;i++)
{
for(i=0;i<10;i++) {
strcpy(fullpath,"PROGDIR:Resources/");
if(locale->loc_PrefLanguages[i])
{
if(locale->loc_PrefLanguages[i]) {
ami_gui_map_filename(&remapped, "PROGDIR:Resources",
locale->loc_PrefLanguages[i], "LangNames");
netsurf_mkpath(&fullpath, &fullpath_len, 2, fullpath, remapped);
found = ami_gui_check_resource(fullpath, file);
}
else
{
} else {
continue;
}
if(found) break;
}
if(!found)
{
if(!found) {
/* If not found yet, check in PROGDIR:Resources/en,
* might not be in user's preferred languages */
@ -393,8 +389,7 @@ bool ami_locate_resource(char *fullpath, const char *file)
CloseLocale(locale);
if(!found)
{
if(!found) {
/* Lastly check directly in PROGDIR:Resources */
strcpy(fullpath, "PROGDIR:Resources/");