Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  add vc12 (2013)

Conflicts:
	ext/gmp/gmp.c

Zend/zend_ini_scanner_defs.h

@@ -1,13 +1,13 @@
-/* Generated by re2c 0.13.5 */
-#line 3 "Zend/zend_ini_scanner_defs.h"
-
-enum YYCONDTYPE {
-	yycINITIAL,
-	yycST_OFFSET,
-	yycST_SECTION_VALUE,
-	yycST_VALUE,
-	yycST_SECTION_RAW,
-	yycST_DOUBLE_QUOTES,
-	yycST_VARNAME,
-	yycST_RAW,
-};
+/* Generated by re2c 0.13.5 */
+#line 3 "Zend/zend_ini_scanner_defs.h"
+
+enum YYCONDTYPE {
+	yycINITIAL,
+	yycST_OFFSET,
+	yycST_SECTION_VALUE,
+	yycST_VALUE,
+	yycST_SECTION_RAW,
+	yycST_DOUBLE_QUOTES,
+	yycST_VARNAME,
+	yycST_RAW,
+};

Zend/zend_language_scanner_defs.h

@@ -1,15 +1,15 @@
-/* Generated by re2c 0.13.5 */
-#line 3 "Zend/zend_language_scanner_defs.h"
-
-enum YYCONDTYPE {
-	yycST_IN_SCRIPTING,
-	yycST_LOOKING_FOR_PROPERTY,
-	yycST_BACKQUOTE,
-	yycST_DOUBLE_QUOTES,
-	yycST_HEREDOC,
-	yycST_LOOKING_FOR_VARNAME,
-	yycST_VAR_OFFSET,
-	yycINITIAL,
-	yycST_END_HEREDOC,
-	yycST_NOWDOC,
-};
+/* Generated by re2c 0.13.5 */
+#line 3 "Zend/zend_language_scanner_defs.h"
+
+enum YYCONDTYPE {
+	yycST_IN_SCRIPTING,
+	yycST_LOOKING_FOR_PROPERTY,
+	yycST_BACKQUOTE,
+	yycST_DOUBLE_QUOTES,
+	yycST_HEREDOC,
+	yycST_LOOKING_FOR_VARNAME,
+	yycST_VAR_OFFSET,
+	yycINITIAL,
+	yycST_END_HEREDOC,
+	yycST_NOWDOC,
+};

ext/gmp/gmp.c

@@ -1759,6 +1759,7 @@ ZEND_FUNCTION(gmp_testbit)
 	zval *a_arg;
 	long index;
 	mpz_ptr gmpnum_a;
+	gmp_temp_t temp_a;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zl", &a_arg, &index) == FAILURE){
 		return;
@@ -1769,8 +1770,9 @@ ZEND_FUNCTION(gmp_testbit)
 		RETURN_FALSE;
 	}
 
-	gmpnum_a = GET_GMP_FROM_ZVAL(a_arg);
-	RETURN_BOOL(mpz_tstbit(gmpnum_a, index));
+	FETCH_GMP_ZVAL(gmpnum_a, a_arg, temp_a);
+	RETVAL_BOOL(mpz_tstbit(gmpnum_a, index));
+	FREE_GMP_TEMP(temp_a);
 }
 /* }}} */