X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_http_url.c;h=5e8592ed8c7c0ae28adb95c19ba068ed172e40b2;hb=3bd2c5e605b408890f623d6cbccd7c402296f869;hp=cead8c8ddc95c026d090d0e56391f269773eb3a3;hpb=96202e444961b5df27adacae7b155312d038dd87;p=m6w6%2Fext-http

diff --git a/src/php_http_url.c b/src/php_http_url.c
index cead8c8..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
 
@@ -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;