diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-02-24 08:47:16 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-02-24 08:47:16 +0000 |
commit | d69dd49ddddc88f19743360b7b71ce2db05d8ec7 (patch) | |
tree | 1274082a32d0c30bd0fc209ed4a14dcbda6c935e | |
parent | dd93b7305f0e37ac2f9ce74aaa1d0f4f66752e59 (diff) | |
download | gnunet-gtk-d69dd49ddddc88f19743360b7b71ce2db05d8ec7.tar.gz gnunet-gtk-d69dd49ddddc88f19743360b7b71ce2db05d8ec7.zip |
-fix segv: add NULL for stderr, needed due to recent API change
-rw-r--r-- | src/fs/gnunet-fs-gtk_event-handler.c | 2 | ||||
-rw-r--r-- | src/main/gnunet-gtk.c | 2 | ||||
-rw-r--r-- | src/setup/gnunet-setup.c | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c index acde3fef..04b38119 100644 --- a/src/fs/gnunet-fs-gtk_event-handler.c +++ b/src/fs/gnunet-fs-gtk_event-handler.c | |||
@@ -2133,7 +2133,7 @@ update_search_result (struct SearchResult *sr, | |||
2133 | int desc_is_a_dup; | 2133 | int desc_is_a_dup; |
2134 | struct GNUNET_GTK_MainWindowContext *mctx = GNUNET_FS_GTK_get_main_context (); | 2134 | struct GNUNET_GTK_MainWindowContext *mctx = GNUNET_FS_GTK_get_main_context (); |
2135 | 2135 | ||
2136 | if (sr == NULL) | 2136 | if (NULL == sr) |
2137 | { | 2137 | { |
2138 | GNUNET_break (0); | 2138 | GNUNET_break (0); |
2139 | return; | 2139 | return; |
diff --git a/src/main/gnunet-gtk.c b/src/main/gnunet-gtk.c index 4a1aca19..f28e5749 100644 --- a/src/main/gnunet-gtk.c +++ b/src/main/gnunet-gtk.c | |||
@@ -190,7 +190,7 @@ start_process (struct Plug *p) | |||
190 | setenv (p->env_var, window_id, 1); | 190 | setenv (p->env_var, window_id, 1); |
191 | p->proc = GNUNET_OS_start_process (GNUNET_NO, | 191 | p->proc = GNUNET_OS_start_process (GNUNET_NO, |
192 | GNUNET_OS_INHERIT_STD_ALL, | 192 | GNUNET_OS_INHERIT_STD_ALL, |
193 | NULL, NULL, | 193 | NULL, NULL, NULL, |
194 | p->binary, | 194 | p->binary, |
195 | p->binary, | 195 | p->binary, |
196 | NULL); | 196 | NULL); |
diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c index 1f5bc0a4..ecdb2c80 100644 --- a/src/setup/gnunet-setup.c +++ b/src/setup/gnunet-setup.c | |||
@@ -410,7 +410,7 @@ GNUNET_SETUP_restart_namestore (void *cls, | |||
410 | } | 410 | } |
411 | namestore = | 411 | namestore = |
412 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ALL, | 412 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ALL, |
413 | NULL, NULL, | 413 | NULL, NULL, NULL, |
414 | "gnunet-service-namestore", | 414 | "gnunet-service-namestore", |
415 | "gnunet-service-namestore", NULL); | 415 | "gnunet-service-namestore", NULL); |
416 | } | 416 | } |
@@ -443,7 +443,7 @@ start_resolver (void *cls, | |||
443 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver"); | 443 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver"); |
444 | resolver = | 444 | resolver = |
445 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ALL, | 445 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ALL, |
446 | NULL,NULL, | 446 | NULL,NULL, NULL, |
447 | binary, | 447 | binary, |
448 | "gnunet-service-resolver", NULL); | 448 | "gnunet-service-resolver", NULL); |
449 | GNUNET_free (binary); | 449 | GNUNET_free (binary); |
@@ -467,7 +467,7 @@ start_identity (void *cls, | |||
467 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-identity"); | 467 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-identity"); |
468 | identity = | 468 | identity = |
469 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ALL, | 469 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ALL, |
470 | NULL, NULL, | 470 | NULL, NULL, NULL, |
471 | binary, | 471 | binary, |
472 | "gnunet-service-identity", NULL); | 472 | "gnunet-service-identity", NULL); |
473 | GNUNET_free (binary); | 473 | GNUNET_free (binary); |
@@ -491,7 +491,7 @@ start_namestore (void *cls, | |||
491 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-namestore"); | 491 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-namestore"); |
492 | namestore = | 492 | namestore = |
493 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ALL, | 493 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ALL, |
494 | NULL, NULL, | 494 | NULL, NULL, NULL, |
495 | binary, | 495 | binary, |
496 | "gnunet-service-namestore", NULL); | 496 | "gnunet-service-namestore", NULL); |
497 | GNUNET_free (binary); | 497 | GNUNET_free (binary); |
@@ -513,7 +513,7 @@ try_gksu (const char *username) | |||
513 | 513 | ||
514 | proc = GNUNET_OS_start_process (GNUNET_NO, | 514 | proc = GNUNET_OS_start_process (GNUNET_NO, |
515 | GNUNET_OS_INHERIT_STD_ALL, | 515 | GNUNET_OS_INHERIT_STD_ALL, |
516 | NULL, NULL, | 516 | NULL, NULL, NULL, |
517 | "gksu", | 517 | "gksu", |
518 | "-u", username, | 518 | "-u", username, |
519 | "-m", _("Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' allows it)"), | 519 | "-m", _("Enter YOUR password to run gnunet-setup as user 'gnunet' (assuming 'sudo' allows it)"), |
@@ -540,7 +540,7 @@ GNUNET_setup_launch_edit_friends_button_clicked_cb (GtkButton *button, | |||
540 | 540 | ||
541 | proc = GNUNET_OS_start_process (GNUNET_NO, | 541 | proc = GNUNET_OS_start_process (GNUNET_NO, |
542 | GNUNET_OS_INHERIT_STD_ALL, | 542 | GNUNET_OS_INHERIT_STD_ALL, |
543 | NULL, NULL, | 543 | NULL, NULL, NULL, |
544 | "gnunet-peerinfo-gtk", | 544 | "gnunet-peerinfo-gtk", |
545 | "-c", option_cfg_name, | 545 | "-c", option_cfg_name, |
546 | NULL); | 546 | NULL); |