Merge branch 'master' of github.com:owlient/phpredis into serializer

Author: nicolasff

library.c

@@ -10,6 +10,7 @@
 #include <zend_exceptions.h>
 #include "php_redis.h"
 #include "library.h"
+#include <ext/standard/php_math.h>
 
 extern zend_class_entry *redis_ce;
 extern zend_class_entry *redis_exception_ce;
@@ -189,17 +190,13 @@ integer_length(int i) {
 }
 
 int
-double_length(double d, int *has_F) {
+double_length(double d) {
         char *s;
-        int ret = spprintf(&s, 0, "%F", d);
-	*has_F = 1;
-	if(ret == 2 && strncmp(s, "%F", 2) == 0) { /* we don't have the 'F' format, get back to 'f' */
-		efree(s);
-		ret = spprintf(&s, 0, "%f", d);
-		*has_F = 0;
-	}
-        efree(s);
-        return ret;
+        int ret;
+	s = _php_math_number_format(d, 8, '.', '\x00');
+	ret = strlen(s);
+	efree(s);
+	return ret;
 }
 
 
@@ -256,8 +253,8 @@ redis_cmd_format_static(char **ret, char *keyword, char *format, ...) {
                 case 'f':
                     /* use spprintf here */
                     dbl = va_arg(ap, double);
-		    int has_F;
-                    sz = double_length(dbl, &has_F);
+                    sz = double_length(dbl);
+		    char *dbl_str;
 		    if(stage == 1) {
 		        memcpy((*ret) + total, "$", 1); 	/* dollar */
 			total++;
@@ -268,11 +265,10 @@ redis_cmd_format_static(char **ret, char *keyword, char *format, ...) {
 			memcpy((*ret) + total, _NL, 2);		/* CRLF */
 			total += 2;
 
-			if(has_F) {
-				sprintf((*ret) + total, "%F", dbl);	/* float */
-			} else {
-				sprintf((*ret) + total, "%f", dbl);	/* float */
-			}
+			/* float value */
+			dbl_str = _php_math_number_format(dbl, 8, '.', '\x00');
+			memcpy((*ret) + total, dbl_str, sz);
+			efree(dbl_str);
 			total += sz;
 
 			memcpy((*ret) + total, _NL, 2);		/* CRLF */
@@ -362,9 +358,14 @@ redis_cmd_format(char **ret, char *format, ...) {
                     case 'f':
                         /* use spprintf here */
                         dbl = va_arg(ap, double);
-                        double_len = spprintf(&double_str, 0, "%F", dbl);
+                        double_len = double_length(dbl);
+
                         if(stage == 1) {
-                            memcpy((*ret) + total, double_str, double_len);
+				/* float value */
+				char *dbl_str = _php_math_number_format(dbl, 8, '.', '\x00');
+				memcpy((*ret) + total, dbl_str, sz);
+				total += sz;
+				efree(dbl_str);
                         }
                         total += double_len;
                         efree(double_str);

library.h

@@ -1,6 +1,6 @@
 void add_constant_long(zend_class_entry *ce, char *name, int value);
 int integer_length(int i);
-int double_length(double d, int *has_F);
+int double_length(double d);
 int redis_cmd_format(char **ret, char *format, ...);
 int redis_cmd_format_static(char **ret, char *keyword, char *format, ...);