tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Rainer Jung <rainer.j...@kippdata.de>
Subject Re: svn commit: r1805861 - /tomcat/native/trunk/native/src/sslcontext.c
Date Wed, 23 Aug 2017 09:39:55 GMT
Am 23.08.2017 um 10:04 schrieb remm@apache.org:
> Author: remm
> Date: Wed Aug 23 08:04:48 2017
> New Revision: 1805861
>
> URL: http://svn.apache.org/viewvc?rev=1805861&view=rev
> Log:
> Fix build error on my setup.
>
> Modified:
>     tomcat/native/trunk/native/src/sslcontext.c
>
> Modified: tomcat/native/trunk/native/src/sslcontext.c
> URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1805861&r1=1805860&r2=1805861&view=diff
> ==============================================================================
> --- tomcat/native/trunk/native/src/sslcontext.c (original)
> +++ tomcat/native/trunk/native/src/sslcontext.c Wed Aug 23 08:04:48 2017
> @@ -530,7 +530,9 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLCont
>      len = sk_SSL_CIPHER_num(sk);
>
>      if (len <= 0) {
> +#if OPENSSL_VERSION_NUMBER < 0x10100000L
>          SSL_free(ssl);
> +#endif
>          return NULL;
>      }
>
> @@ -543,7 +545,9 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLCont
>          c_name = (*e)->NewStringUTF(e, name);
>          (*e)->SetObjectArrayElement(e, array, i, c_name);
>      }
> +#if OPENSSL_VERSION_NUMBER < 0x10100000L
>      SSL_free(ssl);
> +#endif
>      return array;
>  }

Hi Rémy,

thanks for fixing this. Yes freeing when not having it allocated isn't a 
good idea.

Regards,

Rainer

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message