2007-06-08 [wwp] 2.9.2cvs48
authorTristan Chabredier <wwp@claws-mail.org>
Fri, 8 Jun 2007 09:22:51 +0000 (09:22 +0000)
committerTristan Chabredier <wwp@claws-mail.org>
Fri, 8 Jun 2007 09:22:51 +0000 (09:22 +0000)
* src/common/socket.c
Don't crash if fork() fails, thanks to Colin.

ChangeLog
PATCHSETS
configure.ac
src/common/socket.c

index 22b3c19217f9a6a59d61746a3df8166796c6c9bb..a1b02beb8af8813848f7da4b247ff6dfd13e6c43 100644 (file)
--- 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
index fc1f6616e21179433cc1b63ad9ef2558e48e3496..5929a8088a39362e4783f595f7001d2a6d6438ce 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index bb4967aa90bcdfcff5d21375ded3faba58a2863c..c2ab0b1e40960bc525c493cd1ad5cb546d8afe6e 100644 (file)
@@ -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=
 
index 692cf876b3346288bd56644b1ec8cd2abb7ca77b..d373e6bcb9f218da0b2c05423ceb20aa034a6225 100644 (file)
@@ -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);
 }