diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index fa401e9828be..105de796f381 100644
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -1020,6 +1020,9 @@ PHP_FUNCTION(unpack)
 
 						ZSTR_VAL(buf)[len] = '\0';
 
+						/* Advance by the number of bytes consumed, also for '*' */
+						size = (len + 1) / 2;
+
 						ZVAL_STR(&val, buf);
 						zend_symtable_update(Z_ARRVAL_P(return_value), real_name, &val);
 						break;
diff --git a/ext/standard/tests/strings/unpack_hex_star_position.phpt b/ext/standard/tests/strings/unpack_hex_star_position.phpt
new file mode 100644
index 000000000000..52448348bae7
--- /dev/null
+++ b/ext/standard/tests/strings/unpack_hex_star_position.phpt
@@ -0,0 +1,42 @@
+--TEST--
+unpack() with "h*" and "H*" advances the position to the end of the input
+--FILE--
+<?php
+var_dump(unpack("Ca/H*b/X/Cc", "\x01\xab\xcd"));
+var_dump(unpack("Ca/h*b/X/Cc", "\x01\xab\xcd"));
+var_dump(unpack("H*a/H*b", "\xab\xcd"));
+var_dump(unpack("H*a/Cb", "\xab\xcd"));
+var_dump(unpack("H3a/Cb", "\xab\xcd\xef"));
+?>
+--EXPECTF--
+array(3) {
+  ["a"]=>
+  int(1)
+  ["b"]=>
+  string(4) "abcd"
+  ["c"]=>
+  int(205)
+}
+array(3) {
+  ["a"]=>
+  int(1)
+  ["b"]=>
+  string(4) "badc"
+  ["c"]=>
+  int(205)
+}
+array(2) {
+  ["a"]=>
+  string(4) "abcd"
+  ["b"]=>
+  string(0) ""
+}
+
+Warning: unpack(): Type C: not enough input values, need 1 values but only 0 were provided in %s on line %d
+bool(false)
+array(2) {
+  ["a"]=>
+  string(3) "abc"
+  ["b"]=>
+  int(239)
+}