From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 13 Sep 2019 22:00:04 +0000 (+0200)
Subject: Use XtOffsetOf() in url_scanner_ex
X-Git-Tag: php-7.4.0RC2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab4f725d83cbcb1172a96aaa5134f0595f3fb0fa;p=php

Use XtOffsetOf() in url_scanner_ex

Instead of a manual implementation.
---

diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re
index 8ad129380e..1877e68918 100644
--- a/ext/standard/url_scanner_ex.re
+++ b/ext/standard/url_scanner_ex.re
@@ -656,7 +656,7 @@ static int php_url_scanner_ex_activate(int type)
 		ctx = &BG(url_adapt_output_ex);
 	}
 
-	memset(ctx, 0, ((size_t) &((url_adapt_state_ex_t *)0)->tags));
+	memset(ctx, 0, XtOffsetOf(url_adapt_state_ex_t, tags));
 
 	return SUCCESS;
 }