From 89a87736ac1a2bca8b12a3c91a6a5ecb45744b42 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Fri, 8 Jun 2007 09:22:51 +0000 Subject: [PATCH] 2007-06-08 [wwp] 2.9.2cvs48 * src/common/socket.c Don't crash if fork() fails, thanks to Colin. --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/common/socket.c | 9 +++++---- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22b3c1921..a1b02beb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-06-08 [wwp] 2.9.2cvs48 + + * src/common/socket.c + Don't crash if fork() fails, thanks to Colin. + 2007-06-08 [wwp] 2.9.2cvs47 * src/gtk/prefswindow.c diff --git a/PATCHSETS b/PATCHSETS index fc1f6616e..5929a8088 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2623,3 +2623,4 @@ ( cvs diff -u -r 1.204.2.135 -r 1.204.2.136 src/prefs_common.c; ) > 2.9.2cvs45.patchset ( cvs diff -u -r 1.36.2.103 -r 1.36.2.104 src/common/utils.c; ) > 2.9.2cvs46.patchset ( cvs diff -u -r 1.12.2.34 -r 1.12.2.35 src/gtk/prefswindow.c; ) > 2.9.2cvs47.patchset +( cvs diff -u -r 1.13.2.32 -r 1.13.2.33 src/common/socket.c; ) > 2.9.2cvs48.patchset diff --git a/configure.ac b/configure.ac index bb4967aa9..c2ab0b1e4 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=47 +EXTRA_VERSION=48 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/common/socket.c b/src/common/socket.c index 692cf876b..d373e6bcb 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -811,10 +811,11 @@ static gint sock_connect_async_get_address_info_cb(GList *addr_list, conn_data->addr_list = addr_list; conn_data->cur_addr = addr_list; - conn_data->canonical_name = conn_data->lookup_data->canonical_name; - conn_data->lookup_data->canonical_name = NULL; - conn_data->lookup_data = NULL; - + if (conn_data->lookup_data) { + conn_data->canonical_name = conn_data->lookup_data->canonical_name; + conn_data->lookup_data->canonical_name = NULL; + conn_data->lookup_data = NULL; + } return sock_connect_address_list_async(conn_data); } -- 2.25.1