diff --git a/Zend/zend_object_handlers.h b/Zend/zend_object_handlers.h
index ec71c427ffce..d0dd804e8a41 100644
--- a/Zend/zend_object_handlers.h
+++ b/Zend/zend_object_handlers.h
@@ -204,7 +204,7 @@ typedef zend_result (*zend_object_do_operation_t)(uint8_t opcode, zval *result,
 
 struct _zend_object_handlers {
 	/* offset of real object header (usually zero) */
-	int										offset;
+	size_t										offset;
 	/* object handlers */
 	zend_object_free_obj_t					free_obj;             /* required */
 	zend_object_dtor_obj_t					dtor_obj;             /* required */
diff --git a/ext/standard/tests/versioning/version_compare.phpt b/ext/standard/tests/versioning/version_compare.phpt
index 07550dd410f4..e22ddabfa56b 100644
--- a/ext/standard/tests/versioning/version_compare.phpt
+++ b/ext/standard/tests/versioning/version_compare.phpt
@@ -22,6 +22,9 @@ foreach ($special_forms as $f1) {
     test("1.0$f1", "1.0$f2");
     }
 }
+test("1.2.", "1.2.");
+test("1.2..", "1.2..");
+
 print "TESTING OPERATORS\n";
 foreach ($special_forms as $f1) {
     foreach ($special_forms as $f2) {
@@ -106,6 +109,8 @@ TESTING COMPARE
 1.0pl1 > 1.0rc1
 1.0pl1 > 1.0
 1.0pl1 = 1.0pl1
+1.2. = 1.2.
+1.2.. = 1.2..
 TESTING OPERATORS
 1.0-dev lt 1.0-dev : false
 1.0-dev  < 1.0-dev : false
diff --git a/ext/standard/versioning.c b/ext/standard/versioning.c
index 75968ca577fd..99b4a053dd44 100644
--- a/ext/standard/versioning.c
+++ b/ext/standard/versioning.c
@@ -66,7 +66,15 @@ php_canonicalize_version(const char *version)
 		}
 		lp = *p++;
 	}
-	*q++ = '\0';
+
+	/* Check if the last component is empty (i.e. the last character is a dot)
+	 * and remove it if it is. */
+	if (*(q - 1) == '.') {
+		*(q - 1) = '\0';
+	} else {
+		*q = '\0';
+	}
+
 	return buf;
 }