X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_url.c;h=5e8592ed8c7c0ae28adb95c19ba068ed172e40b2;hp=7e325dcaa3fa5539c15fc7994020705b53c74b42;hb=294724730ce2865ecb887ffbb3a1ea8afdea37f5;hpb=7f01bb49f276339b73807aa1a5d65244bf8fd108

diff --git a/src/php_http_url.c b/src/php_http_url.c
index 7e325dc..5e8592e 100644
--- a/src/php_http_url.c
+++ b/src/php_http_url.c
@@ -854,7 +854,7 @@ static ZEND_RESULT_CODE parse_userinfo(struct parse_state *state, const char *pt
 			break;
 
 		}
-	} while(++ptr != end);
+	} while(++ptr < end);
 
 
 	state->buffer[state->offset++] = 0;
@@ -1003,11 +1003,11 @@ static ZEND_RESULT_CODE parse_uidn_2003(struct parse_state *state)
 		goto error;
 	}
 
-#	if __GNUC__
+#	if __GNUC__ >= 5
 #		pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #	endif
 	ahost_len = uidna_IDNToASCII(uhost_str, uhost_len, ahost_str, 256, 3, NULL, &rc);
-#	if __GNUC__
+#	if __GNUC__ >= 5
 #		pragma GCC diagnostic pop
 #	endif
 
@@ -1189,9 +1189,9 @@ static ZEND_RESULT_CODE parse_widn_2003(struct parse_state *state)
 static ZEND_RESULT_CODE parse_idna(struct parse_state *state, size_t len)
 {
 #if PHP_HTTP_HAVE_IDNA2008
-	if ((state->flags & PHP_HTTP_URL_PARSE_TOIDN_2008)
+	if ((state->flags & PHP_HTTP_URL_PARSE_TOIDN_2008) == PHP_HTTP_URL_PARSE_TOIDN_2008
 #	if PHP_HTTP_HAVE_IDNA2003
-	|| !(state->flags & PHP_HTTP_URL_PARSE_TOIDN_2003)
+	||	(state->flags & PHP_HTTP_URL_PARSE_TOIDN_2003) != PHP_HTTP_URL_PARSE_TOIDN_2003
 #	endif
 	) {
 #if HAVE_UIDNA_NAMETOASCII_UTF8
@@ -1205,9 +1205,9 @@ static ZEND_RESULT_CODE parse_idna(struct parse_state *state, size_t len)
 #endif
 
 #if PHP_HTTP_HAVE_IDNA2003
-	if ((state->flags & PHP_HTTP_URL_PARSE_TOIDN_2003)
+	if ((state->flags & PHP_HTTP_URL_PARSE_TOIDN_2003) == PHP_HTTP_URL_PARSE_TOIDN_2003
 #	if PHP_HTTP_HAVE_IDNA2008
-	|| !(state->flags & PHP_HTTP_URL_PARSE_TOIDN_2008)
+	||	(state->flags & PHP_HTTP_URL_PARSE_TOIDN_2008) != PHP_HTTP_URL_PARSE_TOIDN_2008
 #endif
 	) {
 #if HAVE_UIDNA_IDNTOASCII
@@ -1425,7 +1425,7 @@ static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *pt
 			label = ptr;
 			ptr += mb - 1;
 		}
-	} while (++ptr != end);
+	} while (++ptr < end);
 
 	if (!state->url.host) {
 		len = state->offset - len;
@@ -1792,7 +1792,7 @@ static const char *parse_scheme(struct parse_state *state)
 			}
 			state->ptr += mb - 1;
 		}
-	} while (++state->ptr != state->end);
+	} while (++state->ptr < state->end);
 
 softfail:
 	state->offset = 0;