Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Subject: Re: svn commit: r1805861 -
 /tomcat/native/trunk/native/src/sslcontext.c
To: Tomcat Developers List <dev@tomcat.apache.org>
References: <20170823080449.0F7473A0041@svn01-us-west.apache.org>
From: Rainer Jung <rainer.jung@kippdata.de>
Message-ID: <9bb0ae7b-8343-67f5-6074-17109ad6ed3e@kippdata.de>
Date: Wed, 23 Aug 2017 11:39:55 +0200
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101
 Thunderbird/45.8.0
MIME-Version: 1.0
In-Reply-To: <20170823080449.0F7473A0041@svn01-us-west.apache.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 8bit
archived-at: Wed, 23 Aug 2017 09:40:11 -0000

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