fix merge

diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c
index 7100367faac1f1f021c3ef5961b134a050e1127c..10450f196876a0d4b3cf822b2e18dc1f3881be26 100644 (file)
--- a/ext/bcmath/bcmath.c
+++ b/ext/bcmath/bcmath.c
@@ -439,8 +439,9 @@ PHP_FUNCTION(bcpowmod)
        scale_int = (int) ((int)scale < 0 ? 0 : scale);
 
        if (bc_raisemod(first, second, mod, &result, scale_int) != -1) {
-               if (result->n_scale > scale) {
-                       result->n_scale = (int)scale;
+               if (result->n_scale > scale_int) {
+                       result = split_bc_num(result);
+                       result->n_scale = scale_int;
                }
                RETVAL_STR(bc_num2str(result));
        } else {