From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Thu, 12 May 2016 03:49:21 +0000 (-0700)
Subject: RedisBagOStuff: Fix unserialization of negative numbers
X-Git-Tag: 1.31.0-rc.0~7012^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22lang_raccourcis%22%2C%22module=%24nom_module%22%29%20.%20%22?a=commitdiff_plain;h=cdc93a62bf958702f6a54633ea65d289ab4713b8;p=lhc%2Fweb%2Fwiklou.git

RedisBagOStuff: Fix unserialization of negative numbers

ctype_digit( $data ) doesn't return true if $data is
a negative integer.

Bug: T134923
Change-Id: Ie8a23fc6354a15210e010062e3da3058f4c463bb
---

diff --git a/includes/objectcache/RedisBagOStuff.php b/includes/objectcache/RedisBagOStuff.php
index 61e6926c85..90508dac5f 100644
--- a/includes/objectcache/RedisBagOStuff.php
+++ b/includes/objectcache/RedisBagOStuff.php
@@ -310,7 +310,8 @@ class RedisBagOStuff extends BagOStuff {
 	 * @return mixed
 	 */
 	protected function unserialize( $data ) {
-		return ctype_digit( $data ) ? intval( $data ) : unserialize( $data );
+		$int = intval( $data );
+		return $data === (string)$int ? $int : unserialize( $data );
 	}
 
 	/**