From 5e4e31d1c9129c285aa69df0626d8e962e0c08a3 Mon Sep 17 00:00:00 2001 From: Brian Bruns Date: Sun, 20 Mar 2011 15:26:52 -0400 Subject: [PATCH] =?UTF-8?q?format=20security=20patch=20from=20Nirgal=20Vou?= =?UTF-8?q?rg=C3=A8re?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gmdb2/main2.c | 2 +- src/gmdb2/prefs.c | 2 +- src/gmdb2/schema.c | 2 +- src/gmdb2/sql.c | 14 +++++++------- src/gmdb2/table_export.c | 14 +++++++------- src/util/mdb-export.c | 12 ++++++------ 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/gmdb2/main2.c b/src/gmdb2/main2.c index 62923fb..da39805 100644 --- a/src/gmdb2/main2.c +++ b/src/gmdb2/main2.c @@ -102,7 +102,7 @@ gmdb_help_cb(GtkWidget *button, gpointer data) gnome_help_display("gmdb.xml", NULL, &error); if (error != NULL) { - g_warning (error->message); + g_warning ("%s", error->message); g_error_free (error); } diff --git a/src/gmdb2/prefs.c b/src/gmdb2/prefs.c index 1a1e8c7..b7d3721 100644 --- a/src/gmdb2/prefs.c +++ b/src/gmdb2/prefs.c @@ -44,7 +44,7 @@ gmdb_prefs_help_cb(GtkWidget *w, gpointer data) gnome_help_display("gmdb.xml", "gmdb-prefs", &error); if (error != NULL) { - g_warning (error->message); + g_warning ("%s", error->message); g_error_free (error); } } diff --git a/src/gmdb2/schema.c b/src/gmdb2/schema.c index ea4e7ba..01b7f1a 100644 --- a/src/gmdb2/schema.c +++ b/src/gmdb2/schema.c @@ -165,7 +165,7 @@ gmdb_schema_help_cb(GtkWidget *w, gpointer data) gnome_help_display("gmdb.xml", "gmdb-schema", &error); if (error != NULL) { - g_warning (error->message); + g_warning ("%s", error->message); g_error_free (error); } } diff --git a/src/gmdb2/sql.c b/src/gmdb2/sql.c index 4242e58..9345b0b 100644 --- a/src/gmdb2/sql.c +++ b/src/gmdb2/sql.c @@ -104,17 +104,17 @@ gmdb_sql_write_rslt_cb(GtkWidget *w, GladeXML *xml) if (need_headers) { while (col = g_list_nth_data(glist, i)) { gchar *title; - if (i>0) fprintf(outfile,delimiter); + if (i>0) fputs(delimiter, outfile); title = g_strdup(gtk_tree_view_column_get_title(col)); gmdb_print_quote(outfile, need_quote, quotechar, delimiter, title); - fprintf(outfile,"%s", title); + fputs(title, outfile); gmdb_print_quote(outfile, need_quote, quotechar, delimiter, title); g_free(title); i++; } - fprintf(outfile,lineterm); + fputs(lineterm, outfile); g_list_free(glist); } @@ -126,16 +126,16 @@ gmdb_sql_write_rslt_cb(GtkWidget *w, GladeXML *xml) rows++; n_columns = gtk_tree_model_get_n_columns(GTK_TREE_MODEL(store)); for (i=0; i < n_columns; i++) { - if (i>0) fprintf(outfile,delimiter); + if (i>0) fputs(delimiter, outfile); gtk_tree_model_get_value(GTK_TREE_MODEL(store), &iter, i, &value); str = (gchar *) g_value_get_string(&value); gmdb_print_quote(outfile, need_quote, quotechar, delimiter, str); - fprintf(outfile,"%s", str); + fputs(str, outfile); gmdb_print_quote(outfile, need_quote, quotechar, delimiter, str); g_value_unset(&value); } - fprintf(outfile,lineterm); + fputs(lineterm, outfile); } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter)); fclose(outfile); @@ -433,7 +433,7 @@ gmdb_sql_execute_cb(GtkWidget *w, GladeXML *xml) if (mdb_sql_has_error(sql)) { GtkWidget* dlg = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (w)), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, - mdb_sql_last_error(sql)); + "%s", mdb_sql_last_error(sql)); gtk_dialog_run (GTK_DIALOG (dlg)); gtk_widget_destroy (dlg); mdb_sql_reset(sql); diff --git a/src/gmdb2/table_export.c b/src/gmdb2/table_export.c index f81f2ec..444d03d 100644 --- a/src/gmdb2/table_export.c +++ b/src/gmdb2/table_export.c @@ -142,7 +142,7 @@ gmdb_export_help_cb(GtkWidget *w, gpointer data) gnome_help_display("gmdb.xml", "gmdb-table-export", &error); if (error != NULL) { - g_warning (error->message); + g_warning ("%s", error->message); g_error_free (error); } } @@ -195,23 +195,23 @@ int rows=0; /* display column titles */ col=g_ptr_array_index(table->columns,i); if (need_headers) { - if (i>0) fprintf(outfile,delimiter); + if (i>0) fputs(delimiter, outfile); gmdb_print_quote(outfile, need_quote, quotechar, delimiter, col->name); - fprintf(outfile,"%s", col->name); + fputs(col->name, outfile); gmdb_print_quote(outfile, need_quote, quotechar, delimiter, col->name); } } - if (need_headers) fprintf(outfile,lineterm); + if (need_headers) fputs(lineterm, outfile); /* fetch those rows! */ while(mdb_fetch_row(table)) { for (i=0;inum_cols;i++) { - if (i>0) fprintf(outfile,delimiter); + if (i>0) fputs(delimiter, outfile); gmdb_print_quote(outfile, need_quote, quotechar, delimiter, bound_data[i]); - fprintf(outfile,"%s", bound_data[i]); + fputs(bound_data[i], outfile); gmdb_print_quote(outfile, need_quote, quotechar, delimiter, bound_data[i]); } - fprintf(outfile,lineterm); + fputs(lineterm, outfile); rows++; } diff --git a/src/util/mdb-export.c b/src/util/mdb-export.c index 36e950b..31431a1 100644 --- a/src/util/mdb-export.c +++ b/src/util/mdb-export.c @@ -205,10 +205,10 @@ main(int argc, char **argv) for (j=0; jnum_cols; j++) { col=g_ptr_array_index(table->columns,j); if (j) - fprintf(stdout,delimiter); - fprintf(stdout,"%s", sanitize ? sanitize_name(col->name) : col->name); + fputs(delimiter, stdout); + fputs(sanitize ? sanitize_name(col->name) : col->name, stdout); } - fprintf(stdout,"\n"); + fputs("\n", stdout); } while(mdb_fetch_row(table)) { @@ -222,16 +222,16 @@ main(int argc, char **argv) fprintf(stdout, "INSERT INTO %s%s (", namespace, quoted_name); free(quoted_name); for (j=0;jnum_cols;j++) { - if (j>0) fprintf(stdout, ", "); + if (j>0) fputs(", ", stdout); col=g_ptr_array_index(table->columns,j); if (sanitize) quoted_name = sanitize_name(col->name); else quoted_name = mdb->default_backend->quote_schema_name(NULL, col->name); - fprintf(stdout,"%s", quoted_name); + fputs(quoted_name, stdout); free(quoted_name); } - fprintf(stdout, ") VALUES ("); + fputs(") VALUES (", stdout); } for (j=0;jnum_cols;j++) {