Attachment 593599 Details for Bug 749895 – suggested patch

[patch] suggested patch

0017-Add-more-error-handling.patch (text/plain), 1.80 KB, created by Matěj Cepl on 2012-06-21 21:39:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matěj Cepl

Created: 2012-06-21 21:39:05 UTC

Size: 1.80 KB

patch

obsolete

>From 44b76a34d04288f10e067b617733a424754db998 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@redhat.com>
>Date: Thu, 21 Jun 2012 23:34:53 +0200
>Subject: [PATCH 17/18] Add more error handling.
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Basically following advice from
>https://bugzilla.redhat.com/show_bug.cgi?id=749895#c6
>
>Signed-off-by: MatÄj Cepl <mcepl@redhat.com>
>---
> lib/ssl_nss.c |   16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
>diff --git a/lib/ssl_nss.c b/lib/ssl_nss.c
>index 78258af..93efd60 100644
>--- a/lib/ssl_nss.c
>+++ b/lib/ssl_nss.c
>@@ -178,6 +178,8 @@ static gboolean ssl_connected( gpointer data, gint source, b_input_condition con
> 	sock_make_blocking( conn->fd );
> 
> 	conn->prfd = SSL_ImportFD(NULL, PR_ImportTCPSocket(source));
>+        if ( !conn->prfd )
>+                goto ssl_connected_failure;
> 	SSL_OptionSet(conn->prfd, SSL_SECURITY, PR_TRUE);
> 	SSL_OptionSet(conn->prfd, SSL_HANDSHAKE_AS_CLIENT, PR_TRUE);
> 	SSL_BadCertHook(conn->prfd, (SSLBadCertHandler)nss_bad_cert, NULL);
>@@ -197,9 +199,11 @@ static gboolean ssl_connected( gpointer data, gint source, b_input_condition con
> 
> 	conn->func( conn->data, 0, NULL, cond );
> 
>-	PR_Close( conn -> prfd );
>-	if( source >= 0 ) closesocket( source );
>-	g_free( conn );
>+        if ( conn -> prfd )
>+                PR_Close( conn -> prfd );
>+        if( source >= 0 )
>+                closesocket( source );
>+        g_free( conn );
> 
> 	return FALSE;
> }
>@@ -235,8 +239,10 @@ void ssl_disconnect( void *conn_ )
> {
> 	struct scd *conn = conn_;
> 
>-	PR_Close( conn->prfd );
>-	closesocket( conn->fd );
>+        if ( conn-> prfd )
>+                PR_Close( conn->prfd );
>+        if( source >= 0 )
>+                closesocket( conn->fd );
> 
> 	g_free( conn );
> }
>-- 
>1.7.10.2
>

Actions: View | Diff

Attachments on bug 749895: 593599