]> git.pld-linux.org Git - packages/libgda3.git/blame - format-security.patch
- adjusted glib232 and format-security patches for newer glib and glibc
[packages/libgda3.git] / format-security.patch
CommitLineData
5efe86bf
JB
1--- libgda-3.1.5/libgda/sqlite/virtual/gda-vconnection-data-model.c~ 2008-07-20 11:51:22.000000000 +0200
2+++ libgda-3.1.5/libgda/sqlite/virtual/gda-vconnection-data-model.c 2013-11-30 22:15:05.063893169 +0100
00eee7f2
JR
3@@ -242,7 +242,7 @@
4 rc = sqlite3_exec (scnc->connection, str, NULL, 0, &zErrMsg);
5 g_free (str);
6 if (rc != SQLITE_OK) {
7- g_set_error (error, 0, 0, g_strdup (zErrMsg));
cf93ed4b 8+ g_set_error_literal (error, 0, 0, zErrMsg);
00eee7f2
JR
9 sqlite3_free (zErrMsg);
10 gda_vconnection_data_model_table_data_free (td);
11 cnc->priv->table_data_list = g_slist_remove (cnc->priv->table_data_list, td);
12@@ -303,7 +303,7 @@
13 g_free (str);
14
15 if (rc != SQLITE_OK) {
16- g_set_error (error, 0, 0, g_strdup (zErrMsg));
cf93ed4b 17+ g_set_error_literal (error, 0, 0, zErrMsg);
00eee7f2
JR
18 sqlite3_free (zErrMsg);
19 return FALSE;
20 }
5efe86bf
JB
21--- libgda-3.1.5/libgda/sqlite/gda-sqlite-provider.c~ 2013-11-30 22:13:45.023125651 +0100
22+++ libgda-3.1.5/libgda/sqlite/gda-sqlite-provider.c 2013-11-30 22:16:40.384890339 +0100
00eee7f2
JR
23@@ -1032,7 +1032,7 @@
24 g_free (filename);
25
26 if (errmsg != SQLITE_OK) {
27- g_set_error (error, 0, 0, sqlite3_errmsg (scnc->connection));
cf93ed4b 28+ g_set_error_literal (error, 0, 0, sqlite3_errmsg (scnc->connection));
00eee7f2
JR
29 retval = FALSE;
30 }
31 gda_sqlite_free_cnc (scnc);
cf93ed4b 32@@ -1058,8 +1058,8 @@
00eee7f2
JR
33 g_free (tmp);
34
35 if (g_unlink (filename)) {
36- g_set_error (error, 0, 0,
cf93ed4b
JB
37- sys_errlist [errno]);
38+ g_set_error_literal (error, 0, 0,
39+ strerror (errno));
00eee7f2
JR
40 retval = FALSE;
41 }
cf93ed4b 42 g_free (filename);
5efe86bf
JB
43--- libgda-3.1.5/libgda/sql-delimiter/gda-sql-delimiter.c~ 2008-07-20 11:51:22.000000000 +0200
44+++ libgda-3.1.5/libgda/sql-delimiter/gda-sql-delimiter.c 2013-11-30 22:17:32.765454196 +0100
00eee7f2
JR
45@@ -60,7 +60,7 @@
46 g_set_error (gda_sql_error, 0, 0, _("Parse error near `%s'"), gda_delimitertext);
47 else if (!strcmp (string, "syntax error"))
48 g_set_error (gda_sql_error, 0, 0, _("Syntax error near `%s'"), gda_delimitertext);
49- else g_set_error (gda_sql_error, 0, 0, string);
cf93ed4b 50+ else g_set_error_literal (gda_sql_error, 0, 0, string);
00eee7f2
JR
51 }
52 }
53 else
5efe86bf
JB
54--- libgda-3.1.5/libgda/gda-connection.c~ 2008-07-20 11:51:23.000000000 +0200
55+++ libgda-3.1.5/libgda/gda-connection.c 2013-11-30 22:18:40.019508054 +0100
00eee7f2
JR
56@@ -540,7 +540,7 @@
57 event = GDA_CONNECTION_EVENT (l->data);
58 if (gda_connection_event_get_event_type (event) == GDA_CONNECTION_EVENT_ERROR) {
59 if (error && !(*error))
60- g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_OPEN_ERROR,
cf93ed4b 61+ g_set_error_literal (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_OPEN_ERROR,
00eee7f2
JR
62 gda_connection_event_get_description (event));
63 gda_client_notify_error_event (cnc->priv->client, cnc,
64 GDA_CONNECTION_EVENT (l->data));
65@@ -1200,7 +1200,7 @@
66 while (events && !has_error) {
67 if (gda_connection_event_get_event_type (GDA_CONNECTION_EVENT (events->data)) ==
68 GDA_CONNECTION_EVENT_ERROR) {
69- g_set_error (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_EXECUTE_COMMAND_ERROR,
cf93ed4b 70+ g_set_error_literal (error, GDA_CONNECTION_ERROR, GDA_CONNECTION_EXECUTE_COMMAND_ERROR,
00eee7f2
JR
71 gda_connection_event_get_description (GDA_CONNECTION_EVENT (events->data)));
72 has_error = TRUE;
73 }
5efe86bf
JB
74--- libgda-3.1.5/libgda/gda-data-model-bdb.c~ 2008-07-20 11:51:23.000000000 +0200
75+++ libgda-3.1.5/libgda/gda-data-model-bdb.c 2013-11-30 22:19:02.359746578 +0100
00eee7f2
JR
76@@ -216,7 +216,7 @@
77 {
78 GError *error = NULL;
79
80- g_set_error (&error, 0, 0, err);
cf93ed4b 81+ g_set_error_literal (&error, 0, 0, err);
00eee7f2
JR
82 g_print ("ADD_ERROR (%s)\n", err);
83 model->priv->errors = g_slist_append (model->priv->errors, error);
84 }
5efe86bf
JB
85--- libgda-3.1.5/libgda/gda-data-model-dir.c~ 2013-11-30 22:13:45.019792285 +0100
86+++ libgda-3.1.5/libgda/gda-data-model-dir.c 2013-11-30 22:21:11.304449215 +0100
00eee7f2
JR
87@@ -250,7 +250,7 @@
88 {
89 GError *error = NULL;
90
91- g_set_error (&error, 0, 0, err);
cf93ed4b 92+ g_set_error_literal (&error, 0, 0, err);
00eee7f2
JR
93 g_print ("ADD_ERROR (%s)\n", err);
94 model->priv->errors = g_slist_append (model->priv->errors, error);
95 }
96@@ -929,7 +929,7 @@
97 str = g_strdup_printf (_("Row %d out of range 0 - %d"), row,
98 imodel->priv->rows->len - 1);
99 add_error (imodel, str);
100- g_set_error (error, 0, 0, str);
cf93ed4b 101+ g_set_error_literal (error, 0, 0, str);
00eee7f2
JR
102 g_free (str);
103 return FALSE;
104 }
105@@ -1006,7 +1006,7 @@
106 str = g_strdup_printf (_("Could not rename file '%s' to '%s'"),
107 filename, new_filename);
108 add_error (imodel, str);
109- g_set_error (error, 0, 0, str);
cf93ed4b 110+ g_set_error_literal (error, 0, 0, str);
00eee7f2
JR
111 g_free (str);
112 g_free (new_filename);
113 g_free (filename);
114@@ -1029,7 +1029,7 @@
115 gchar *str;
116 str = g_strdup_printf (_("Could not create directory '%s'"), new_path);
117 add_error (imodel, str);
118- g_set_error (error, 0, 0, str);
cf93ed4b 119+ g_set_error_literal (error, 0, 0, str);
00eee7f2
JR
120 g_free (str);
121 g_free (old_path);
122 return FALSE;
123@@ -1049,7 +1049,7 @@
124 gchar *str;
125 str = g_strdup_printf (_("Could not rename file '%s' to '%s'"), filename, new_filename);
126 add_error (imodel, str);
127- g_set_error (error, 0, 0, str);
cf93ed4b 128+ g_set_error_literal (error, 0, 0, str);
00eee7f2
JR
129 g_free (str);
130 g_free (new_filename);
131 g_free (filename);
132@@ -1098,7 +1098,7 @@
133 gchar *str;
134 str = g_strdup_printf (_("Could not overwrite contents of file '%s'"), filename);
135 add_error (imodel, str);
136- g_set_error (error, 0, 0, str);
cf93ed4b 137+ g_set_error_literal (error, 0, 0, str);
00eee7f2
JR
138 g_free (str);
139 g_object_unref (op);
140 g_free (filename);
141@@ -1230,7 +1230,7 @@
142 gchar *str;
143 str = g_strdup_printf (_("Cannot set contents of filename '%s'"), complete_filename);
144 add_error (imodel, str);
145- g_set_error (error, 0, 0, str);
cf93ed4b 146+ g_set_error_literal (error, 0, 0, str);
00eee7f2
JR
147 g_free (str);
148 if (bin_to_free)
149 g_free (bin_data);
150@@ -1241,7 +1241,7 @@
151 gchar *str;
152 str = g_strdup_printf (_("Cannot create directory '%s'"), dirname);
153 add_error (imodel, str);
154- g_set_error (error, 0, 0, str);
cf93ed4b 155+ g_set_error_literal (error, 0, 0, str);
00eee7f2
JR
156 g_free (str);
157 return -1;
158 }
159@@ -1272,7 +1272,7 @@
160 str = g_strdup_printf (_("Row %d out of range 0 - %d"), row,
161 imodel->priv->rows->len - 1);
162 add_error (imodel, str);
163- g_set_error (error, 0, 0, str);
cf93ed4b 164+ g_set_error_literal (error, 0, 0, str);
00eee7f2
JR
165 g_free (str);
166 return FALSE;
167 }
168@@ -1288,7 +1288,7 @@
169 gchar *str;
170 str = g_strdup_printf (_("Cannot remove file '%s'"), filename);
171 add_error (imodel, str);
172- g_set_error (error, 0, 0, str);
cf93ed4b 173+ g_set_error_literal (error, 0, 0, str);
00eee7f2
JR
174 g_free (str);
175 g_free (filename);
176 return FALSE;
5efe86bf
JB
177--- libgda-3.1.5/libgda/gda-data-model-import.c~ 2008-07-20 11:51:23.000000000 +0200
178+++ libgda-3.1.5/libgda/gda-data-model-import.c 2013-11-30 22:21:33.504683758 +0100
00eee7f2
JR
179@@ -1734,7 +1734,7 @@
180 {
181 GError *error = NULL;
182
183- g_set_error (&error, 0, 0, err);
cf93ed4b 184+ g_set_error_literal (&error, 0, 0, err);
00eee7f2
JR
185 model->priv->errors = g_slist_append (model->priv->errors, error);
186 }
187
5efe86bf
JB
188--- libgda-3.1.5/libgda/gda-parameter-list.c~ 2008-07-20 11:51:23.000000000 +0200
189+++ libgda-3.1.5/libgda/gda-parameter-list.c 2013-11-30 22:22:53.398858452 +0100
00eee7f2
JR
190@@ -579,7 +579,7 @@
191 errors = gda_data_model_import_get_errors (GDA_DATA_MODEL_IMPORT (model));
192 if (errors) {
193 GError *err = (GError *) errors->data;
194- g_set_error (error, 0, 0, err->message);
cf93ed4b 195+ g_set_error_literal (error, 0, 0, err->message);
00eee7f2
JR
196 g_object_unref (model);
197 model = NULL;
198 allok = FALSE;
199@@ -803,7 +803,7 @@
200 /* parameters' values, sources, constraints: TODO */
201
202 xmlDocDumpFormatMemory(doc, &xmlbuff, &buffersize, 1);
203- g_print ((gchar *) xmlbuff);
204+ g_print ("%s", (gchar *) xmlbuff);
205
206 xmlFreeDoc(doc);
207 return (gchar *) xmlbuff;
5efe86bf
JB
208--- libgda-3.1.5/libgda/gda-query.c~ 2008-07-20 11:51:23.000000000 +0200
209+++ libgda-3.1.5/libgda/gda-query.c 2013-11-30 22:23:47.282756947 +0100
00eee7f2
JR
210@@ -2826,7 +2826,7 @@
211 if ((gda_connection_event_get_event_type (GDA_CONNECTION_EVENT (list->data)) ==
212 GDA_CONNECTION_EVENT_ERROR) &&
213 !g_list_find (errors_before, list->data))
214- g_set_error (error, GDA_QUERY_ERROR, GDA_QUERY_EXEC_ERROR,
cf93ed4b 215+ g_set_error_literal (error, GDA_QUERY_ERROR, GDA_QUERY_EXEC_ERROR,
00eee7f2
JR
216 gda_connection_event_get_description (GDA_CONNECTION_EVENT (list->data)));
217 }
218 if (errors_before)
219@@ -4359,7 +4359,7 @@
220 errors = gda_data_model_import_get_errors (GDA_DATA_MODEL_IMPORT (model));
221 if (errors) {
222 GError *err = (GError *) errors->data;
223- g_set_error (error, 0, 0, err->message);
cf93ed4b 224+ g_set_error_literal (error, 0, 0, err->message);
00eee7f2
JR
225 g_object_unref (model);
226 model = NULL;
227 return FALSE;
5efe86bf
JB
228--- libgda-3.1.5/libgda/gda-query-field-value.c~ 2008-07-20 11:51:23.000000000 +0200
229+++ libgda-3.1.5/libgda/gda-query-field-value.c 2013-11-30 22:24:26.649835416 +0100
cf93ed4b
JB
230@@ -1471,7 +1471,7 @@ gda_query_field_value_render_as_sql (Gda
231 gda_object_get_name (GDA_OBJECT (param_source)), str2);
232 g_free (str2);
233
234- g_set_error (error,
235+ g_set_error_literal (error,
00eee7f2
JR
236 GDA_QUERY_FIELD_VALUE_ERROR,
237 GDA_QUERY_FIELD_VALUE_RENDER_ERROR,
cf93ed4b 238 str);
5efe86bf
JB
239--- libgda-3.1.5/providers/mysql/gda-mysql-provider.c~ 2008-07-20 11:51:16.000000000 +0200
240+++ libgda-3.1.5/providers/mysql/gda-mysql-provider.c 2013-11-30 22:26:15.987641260 +0100
00eee7f2
JR
241@@ -282,7 +282,7 @@
242
243
244 if (!mysql_ret) {
245- g_set_error (error, 0, 0, mysql_error (mysql));
cf93ed4b 246+ g_set_error_literal (error, 0, 0, mysql_error (mysql));
00eee7f2
JR
247 g_free (mysql);
248 return NULL;
249 }
250@@ -767,7 +767,7 @@
251 g_free (sql);
252
253 if (res) {
254- g_set_error (error, 0, 0, mysql_error (mysql));
cf93ed4b 255+ g_set_error_literal (error, 0, 0, mysql_error (mysql));
00eee7f2
JR
256 mysql_close (mysql);
257 return FALSE;
258 }
5efe86bf
JB
259--- libgda-3.1.5/providers/mysql/gda-mysql-recordset.c~ 2008-07-20 11:51:16.000000000 +0200
260+++ libgda-3.1.5/providers/mysql/gda-mysql-recordset.c 2013-11-30 22:27:20.854980814 +0100
00eee7f2
JR
261@@ -314,7 +314,7 @@
262 str = g_strdup_printf (_("Row number out of range 0 - %d"),
263 priv_data->mysql_res_rows - 1);
264 gda_connection_add_event_string (priv_data->cnc, str);
265- g_set_error (error, 0, 0, str);
cf93ed4b 266+ g_set_error_literal (error, 0, 0, str);
00eee7f2
JR
267 g_free (str);
268
269 return NULL;
270@@ -829,7 +829,7 @@
271 if (rc != 0) {
272 GdaConnectionEvent *event = gda_mysql_make_error (mysql);
273 gda_connection_add_event (priv_data->cnc, event);
274- g_set_error (error, 0, 0,
cf93ed4b 275+ g_set_error_literal (error, 0, 0,
00eee7f2
JR
276 gda_connection_event_get_description (event));
277 return FALSE;
278 }
5efe86bf
JB
279--- libgda-3.1.5/providers/postgres/gda-postgres-provider.c~ 2008-07-20 11:51:16.000000000 +0200
280+++ libgda-3.1.5/providers/postgres/gda-postgres-provider.c 2013-11-30 22:28:06.188783192 +0100
00eee7f2
JR
281@@ -1063,7 +1063,7 @@
282 g_string_free (string, TRUE);
283
284 if (PQstatus (pconn) != CONNECTION_OK) {
285- g_set_error (error, 0, 0, PQerrorMessage (pconn));
cf93ed4b 286+ g_set_error_literal (error, 0, 0, PQerrorMessage (pconn));
00eee7f2
JR
287 PQfinish(pconn);
288
289 return FALSE;
290@@ -1077,7 +1077,7 @@
291 pg_res = gda_postgres_PQexec_wrap (cnc, pconn, sql);
292 g_free (sql);
293 if (!pg_res || PQresultStatus (pg_res) != PGRES_COMMAND_OK) {
294- g_set_error (error, 0, 0, PQresultErrorMessage (pg_res));
cf93ed4b 295+ g_set_error_literal (error, 0, 0, PQresultErrorMessage (pg_res));
00eee7f2
JR
296 PQfinish (pconn);
297 return FALSE;
298 }
5efe86bf
JB
299--- libgda-3.1.5/tools/gda-config-tool.c~ 2008-07-20 11:51:14.000000000 +0200
300+++ libgda-3.1.5/tools/gda-config-tool.c 2013-11-30 22:29:03.256038954 +0100
00eee7f2
JR
301@@ -1402,9 +1402,9 @@
302 const char *paramInDsn = "DSN parameters:";
303
304 g_print ("Provider name: %s\n", info->id);
305- g_print (desc);
306+ g_print ("%s", desc);
307 pretty_print (info->description, strlen (desc));
308- g_print (paramInDsn);
309+ g_print ("%s", paramInDsn);
310 str = g_string_new (NULL);
311 if (info->gda_params)
312 g_slist_foreach (info->gda_params->parameters, add_param_name_to_string, str);
This page took 0.134902 seconds and 5 git commands to generate.