sharpetronics/geany
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure uses of filename are protected against nulls when running

Browse Source 
a build command and give status message if not.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4147 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Lex Trotman 2009-09-03 04:32:05 +00:00
parent 8af51d54f5
commit a1ca1ed099
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -3,6 +3,9 @@
* src/build.c, src/filetypes.h, src/filetypes.c * src/build.c, src/filetypes.h, src/filetypes.c
Only write filetype config files when build command or regex is Only write filetype config files when build command or regex is
actually changed. Removed commented code in src/filetypes.c. actually changed. Removed commented code in src/filetypes.c.
* src/build.c
Ensure uses of filename are protected against nulls when running
a build command and give status message if not.
2009-09-01 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> 2009-09-01 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>

13
src/build.c
View File

@ -504,7 +504,7 @@ static gchar* build_replace_placeholder(const GeanyDocument* doc, const gchar* s
gchar* ret_str; /* to be freed when not in use anymore */ gchar* ret_str; /* to be freed when not in use anymore */
stack = g_string_new(src); stack = g_string_new(src);
if (doc!=NULL) if (doc!=NULL && doc->file_name!=NULL)
{ {
filename = utils_get_utf8_from_locale(doc->file_name); filename = utils_get_utf8_from_locale(doc->file_name);
@ -534,7 +534,7 @@ static gchar* build_replace_placeholder(const GeanyDocument* doc, const gchar* s
else if (strstr(stack->str, "%p")) else if (strstr(stack->str, "%p"))
{ /* fall back to %d */ { /* fall back to %d */
ui_set_statusbar(FALSE, _("failed to substitute %%p, no project active")); ui_set_statusbar(FALSE, _("failed to substitute %%p, no project active"));
if (doc!=NULL) if (doc!=NULL && filename!=NULL)
replacement = g_path_get_dirname(filename); replacement = g_path_get_dirname(filename);
} }
@ -568,7 +568,12 @@ static GPid build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *d
gint stderr_fd; gint stderr_fd;
#endif #endif
g_return_val_if_fail(doc!=NULL || dir!=NULL, (GPid) 1); if(!( (doc!=NULL && NZV(doc->file_name)) || NZV(dir) ))
{
geany_debug("Failed to run command with no working directory");
ui_set_statusbar(TRUE, _("Process failed, no working directory"));
return (GPid)1;
}
if (doc!=NULL) if (doc!=NULL)
clear_errors(doc); clear_errors(doc);
@ -712,7 +717,7 @@ static gchar *prepare_run_script(GeanyDocument *doc, gchar **vte_cmd_nonscript,
if (! result) if (! result)
{ {
ui_set_statusbar(TRUE, _("Failed to execute \"%s\" (start-script could not be created)"), ui_set_statusbar(TRUE, _("Failed to execute \"%s\" (start-script could not be created)"),
cmd_string); NZV(cmd_string) ? cmd_string: NULL);
} }
utils_free_pointers(4, cmd_string, tmp, executable, locale_filename, NULL); utils_free_pointers(4, cmd_string, tmp, executable, locale_filename, NULL);