From: Michael Wallner <mike@php.net>
Date: Wed, 15 Dec 2021 12:47:37 +0000 (+0100)
Subject: followup to 4e6d146
X-Git-Tag: v0.1.0~75
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=3dc78a6faeec1b34a7d374a42be30b8f67cdb91e;hp=cf2cebaf281d2398f1c97f1d00d392383a7dfb24;p=awesomized%2Fext-ion

followup to 4e6d146
---

diff --git a/ion.c b/ion.c
index 3e8ba01..b0730c5 100644
--- a/ion.c
+++ b/ion.c
@@ -169,17 +169,12 @@ ZEND_METHOD(ion_Decimal, __construct)
 		php_ion_decimal_ctx_ctor(php_ion_obj(decimal_ctx, obj->ctx));
 	}
 
+	decContext *ctx = &php_ion_obj(decimal_ctx, obj->ctx)->ctx;
+
 	if (zstr) {
-		ION_CHECK(ion_decimal_from_string(&obj->dec, zstr->val,
-			obj->ctx ? &php_ion_obj(decimal_ctx, obj->ctx)->ctx : NULL));
-	} else if (num <= INT32_MAX && num >= INT32_MIN) {
-		ION_CHECK(ion_decimal_from_int32(&obj->dec, num));
-	} else if (num > 0 && num <= UINT32_MAX) {
-		ION_CHECK(ion_decimal_from_uint32(&obj->dec, num));
+		ION_CHECK(ion_decimal_from_string(&obj->dec, zstr->val, ctx), OBJ_RELEASE(obj->ctx));
 	} else {
-		zend_throw_exception_ex(spl_ce_OverflowException, 0,
-			"Integer value out of bounds: " ZEND_LONG_FMT " (INT32_MIN < n < UINT32_MAX)", num);
-		return;
+		php_ion_decimal_from_zend_long(&obj->dec, ctx, num);
 	}
 
 	php_ion_decimal_ctor(obj);
@@ -217,7 +212,7 @@ ZEND_METHOD(ion_Decimal, toInt)
 	ZEND_PARSE_PARAMETERS_NONE();
 
 	zend_long l;
-	php_ion_decimal_to_int(&obj->dec, &php_ion_obj(decimal_ctx, obj->ctx)->ctx, &l);
+	php_ion_decimal_to_zend_long(&obj->dec, &php_ion_obj(decimal_ctx, obj->ctx)->ctx, &l);
 	RETURN_LONG(l);
 }
 ZEND_METHOD(ion_Decimal, isInt)
@@ -1451,17 +1446,17 @@ PHP_RSHUTDOWN_FUNCTION(ion)
 
 PHP_MINIT_FUNCTION(ion)
 {
-	if (!g_ion_int_zend_max) {
-		decContextDefault(&g_dec_ctx, DEC_INIT_DECIMAL64);
+	decContextDefault(&g_dec_ctx, DEC_INIT_DECIMAL64);
 
-		ion_int_alloc(NULL, &g_ion_int_zend_max);
-		ion_int_from_long(g_ion_int_zend_max, ZEND_LONG_MAX);
-		ion_decimal_from_ion_int(&g_ion_dec_zend_max, &g_dec_ctx, g_ion_int_zend_max);
+	ion_int_alloc(NULL, &g_ion_int_zend_max);
+	ion_int_from_long(g_ion_int_zend_max, ZEND_LONG_MAX);
+	g_ion_dec_zend_max.type = ION_DECIMAL_TYPE_QUAD;
+	ion_decimal_from_ion_int(&g_ion_dec_zend_max, &g_dec_ctx, g_ion_int_zend_max);
 
-		ion_int_alloc(NULL, &g_ion_int_zend_min);
-		ion_int_from_long(g_ion_int_zend_min, ZEND_LONG_MIN);
-		ion_decimal_from_ion_int(&g_ion_dec_zend_min, &g_dec_ctx, g_ion_int_zend_min);
-	}
+	ion_int_alloc(NULL, &g_ion_int_zend_min);
+	ion_int_from_long(g_ion_int_zend_min, ZEND_LONG_MIN);
+	g_ion_dec_zend_min.type = ION_DECIMAL_TYPE_QUAD;
+	ion_decimal_from_ion_int(&g_ion_dec_zend_min, &g_dec_ctx, g_ion_int_zend_min);
 
 	ce_Annotation = register_class_ion_Annotation();
 
@@ -1512,10 +1507,8 @@ PHP_MINIT_FUNCTION(ion)
 
 PHP_MSHUTDOWN_FUNCTION(ion)
 {
-	if (g_ion_int_zend_max) {
-		ion_int_free(g_ion_int_zend_max);
-		ion_int_free(g_ion_int_zend_min);
-	}
+	ion_int_free(g_ion_int_zend_max);
+	ion_int_free(g_ion_int_zend_min);
 	return SUCCESS;
 }
 PHP_MINFO_FUNCTION(ion)
diff --git a/ion_private.h b/ion_private.h
index d1d380f..6aa8932 100644
--- a/ion_private.h
+++ b/ion_private.h
@@ -421,6 +421,25 @@ typedef struct php_ion_decimal {
 	zend_object *ctx, std;
 } php_ion_decimal;
 
+static inline void php_ion_decimal_from_zend_long(ION_DECIMAL *dec, decContext *ctx, zend_long num)
+{
+	if (num <= INT32_MAX && num >= INT32_MIN) {
+		ION_CHECK(ion_decimal_from_int32(dec, num));
+	} else if (num > 0 && num <= UINT32_MAX) {
+		ION_CHECK(ion_decimal_from_uint32(dec, num));
+	} else {
+		ION_INT *iint;
+		ION_CHECK(ion_int_alloc(NULL, &iint));
+		ION_CHECK(ion_int_from_long(iint, num),
+				ion_int_free(iint));
+		/* WATCH OUT: BS API */
+		dec->type = ION_DECIMAL_TYPE_QUAD;
+		ION_CHECK(ion_decimal_from_ion_int(dec, ctx, iint),
+				ion_int_free(iint));
+		ion_int_free(iint);
+	}
+}
+
 static inline zend_string *php_ion_decimal_to_string(ION_DECIMAL *dec)
 {
 	zend_string *zstr = zend_string_alloc(ION_DECIMAL_STRLEN(dec), 0);
@@ -428,7 +447,7 @@ static inline zend_string *php_ion_decimal_to_string(ION_DECIMAL *dec)
 	return zend_string_truncate(zstr, strlen(zstr->val), 0);
 }
 
-static inline void php_ion_decimal_to_int(ION_DECIMAL *dec, decContext *ctx, zend_long *l)
+static inline void php_ion_decimal_to_zend_long(ION_DECIMAL *dec, decContext *ctx, zend_long *l)
 {
 	ION_INT *ii = NULL;
 	ION_CHECK(ion_int_alloc(NULL, &ii));
@@ -473,7 +492,7 @@ static inline void php_ion_decimal_ctor(php_ion_decimal *obj)
 
 	if (php_ion_decimal_fits_zend_long(obj)) {
 		zend_long l;
-		php_ion_decimal_to_int(&obj->dec, &php_ion_obj(decimal_ctx, obj->ctx)->ctx, &l);
+		php_ion_decimal_to_zend_long(&obj->dec, &php_ion_obj(decimal_ctx, obj->ctx)->ctx, &l);
 		zend_update_property_long(obj->std.ce, &obj->std, ZEND_STRL("number"), l);
 	} else {
 		zend_string *zstr = php_ion_decimal_to_string(&obj->dec);