aboutsummaryrefslogtreecommitdiff
path: root/src/gns/gnunet-gns-proxy.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-03-13 18:27:32 +0100
committerChristian Grothoff <christian@grothoff.org>2017-03-13 18:27:32 +0100
commitfedee536d5e414b6d8a7bb8a7587d9d747dd5394 (patch)
tree2fab51a89b5d670e6286c79f65aec4bbd2691641 /src/gns/gnunet-gns-proxy.c
parent08bbdceec656d8bff04cf5b572173edb2100a6ba (diff)
downloadgnunet-fedee536d5e414b6d8a7bb8a7587d9d747dd5394.tar.gz
gnunet-fedee536d5e414b6d8a7bb8a7587d9d747dd5394.zip
fix possible NPE
Diffstat (limited to 'src/gns/gnunet-gns-proxy.c')
-rw-r--r--src/gns/gnunet-gns-proxy.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 6eb87a95e..c336848ce 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -865,7 +865,8 @@ check_ssl_certificate (struct Socks5Request *s5r)
865 const char *name; 865 const char *name;
866 866
867 s5r->ssl_checked = GNUNET_YES; 867 s5r->ssl_checked = GNUNET_YES;
868 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "XXXXXX\n"); 868 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
869 "Checking SSL certificate\n");
869 if (CURLE_OK != 870 if (CURLE_OK !=
870 curl_easy_getinfo (s5r->curl, 871 curl_easy_getinfo (s5r->curl,
871 CURLINFO_TLS_SESSION, 872 CURLINFO_TLS_SESSION,
@@ -1882,19 +1883,22 @@ mhd_connection_cb (void *cls,
1882 { 1883 {
1883 if (GNUNET_NETWORK_get_fd (s5r->sock) == sock) 1884 if (GNUNET_NETWORK_get_fd (s5r->sock) == sock)
1884 { 1885 {
1885 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Context set...\n"); 1886 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1887 "Context set...\n");
1888 s5r->ssl_checked = GNUNET_NO;
1886 *con_cls = s5r; 1889 *con_cls = s5r;
1887 break; 1890 break;
1888 } 1891 }
1889 } 1892 }
1890 s5r->ssl_checked = GNUNET_NO;
1891 break; 1893 break;
1892 case MHD_CONNECTION_NOTIFY_CLOSED: 1894 case MHD_CONNECTION_NOTIFY_CLOSED:
1893 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connection closed... cleaning up\n"); 1895 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1896 "Connection closed... cleaning up\n");
1894 s5r = *con_cls; 1897 s5r = *con_cls;
1895 if (NULL == s5r) 1898 if (NULL == s5r)
1896 { 1899 {
1897 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Connection stale!\n"); 1900 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
1901 "Connection stale!\n");
1898 return; 1902 return;
1899 } 1903 }
1900 cleanup_s5r (s5r); 1904 cleanup_s5r (s5r);