From: Sam Reed <reedy@users.mediawiki.org>
Date: Thu, 18 Nov 2010 02:32:58 +0000 (+0000)
Subject: Reverting r76928, causes segfault
X-Git-Tag: 1.31.0-rc.0~33833
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=9a301f1636a962ff8cd5d4447f06679fdc890b5a;p=lhc%2Fweb%2Fwiklou.git

Reverting r76928, causes segfault
---

diff --git a/includes/IP.php b/includes/IP.php
index 356c770ce4..9aeba39f2c 100644
--- a/includes/IP.php
+++ b/includes/IP.php
@@ -42,7 +42,7 @@ define( 'RE_IPV6_ADD',
 	'|' . // has no "::"
 		RE_IPV6_WORD . '(?::' . RE_IPV6_WORD . '){7}' .
 	'|' . // contains one "::" in the middle (awkward regex for PCRE 4.0+ compatibility)
-		RE_IPV6_WORD . '(?::(?P<abn>(?!(?P=abn)):(?P<iabn>))?' . RE_IPV6_WORD . '){1,6}(?P=iabn)' .
+		RE_IPV6_WORD . '(?::(?!(?P=abn))(?P<abn>:(?P<iabn>))?' . RE_IPV6_WORD . '){1,6}(?P=iabn)' .
 		// NOTE: (?!(?P=abn)) fails iff "::" used twice; (?P=iabn) passes iff a "::" was found.
 		
 		// Better regexp (PCRE 7.2+ only), allows intuitive regex concatenation