From: Andy Polyakov <appro@openssl.org>
Date: Wed, 16 May 2012 18:22:15 +0000 (+0000)
Subject: s2_clnt.c: compensate for compiler bug [from HEAD].
X-Git-Tag: OpenSSL_1_0_2-beta1~624
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4d321e0767bc928e47803dbc1a32bdbd01b17386;p=oweals%2Fopenssl.git

s2_clnt.c: compensate for compiler bug [from HEAD].
---

diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c
index 00ac158f9b..76b690ea13 100644
--- a/ssl/s2_clnt.c
+++ b/ssl/s2_clnt.c
@@ -359,12 +359,14 @@ static int get_server_hello(SSL *s)
 					SSL_R_PEER_ERROR);
 			return(-1);
 			}
-#ifdef __APPLE_CC__
-		/* The Rhapsody 5.5 (a.k.a. MacOS X) compiler bug
-		 * workaround. <appro@fy.chalmers.se> */
-		s->hit=(i=*(p++))?1:0;
-#else
+#if 0
 		s->hit=(*(p++))?1:0;
+		/* Some [PPC?] compilers fail to increment p in above
+		   statement, e.g. one provided with Rhapsody 5.5, but
+		   most recent example XL C 11.1 for AIX, even without
+		   optimization flag... */
+#else
+		s->hit=(*p)?1:0; p++;
 #endif
 		s->s2->tmp.cert_type= *(p++);
 		n2s(p,i);