sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a NULL pointer deref when closing a gnutls session.

Browse source 
Submitted by:	Volker <volker@vwsoft.com>
This commit is contained in:
Joe Marcus Clarke 2012-03-04 23:53:03 +00:00
parent 279d117c65
commit a8c7d18ba7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=292698
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/glib-networking/Makefile
View file

@ -8,7 +8,7 @@
PORTNAME= glib-networking PORTNAME= glib-networking
PORTVERSION= 2.28.7 PORTVERSION= 2.28.7
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= net CATEGORIES= net
MASTER_SITES= GNOME MASTER_SITES= GNOME
DIST_SUBDIR= gnome2 DIST_SUBDIR= gnome2

21
net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c Normal file
View file

@ -0,0 +1,21 @@
--- tls/gnutls/gtlsclientconnection-gnutls.c.orig 2012-03-04 18:47:23.000000000 -0500
+++ tls/gnutls/gtlsclientconnection-gnutls.c 2012-03-04 18:50:26.000000000 -0500
@@ -349,7 +349,8 @@ g_tls_client_connection_gnutls_finish_ha
{
GTlsClientConnectionGnutls *gnutls = G_TLS_CLIENT_CONNECTION_GNUTLS (conn);
- if (g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) &&
+ if (inout_error &&
+ g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) &&
gnutls->priv->cert_requested)
{
g_clear_error (inout_error);
@@ -361,7 +362,7 @@ g_tls_client_connection_gnutls_finish_ha
{
gnutls_datum session_data;
- if (!*inout_error &&
+ if (inout_error && !*inout_error &&
gnutls_session_get_data2 (g_tls_connection_gnutls_get_session (conn),
&session_data) == 0)
{