Change order of RARRAY_AREF and ARY_SET_LEN in rb_ary_pop

We should access the last element first before we shrink the length of the
array.

1 files changed, 5 insertions, 3 deletions

diff --git a/array.c b/array.c
index 9f13b1bf51..d9dff28ad9 100644
--- a/array.c
+++ b/array.c
@@ -1439,10 +1439,12 @@ rb_ary_pop(VALUE ary)
     {
         ary_resize_capa(ary, n * 2);
     }
-    --n;
-    ARY_SET_LEN(ary, n);
+
+    VALUE obj = RARRAY_AREF(ary, n - 1);
+
+    ARY_SET_LEN(ary, n - 1);
     ary_verify(ary);
-    return RARRAY_AREF(ary, n);
+    return obj;
 }
 
 /*