diff --git a/ext/dom/node.c b/ext/dom/node.c
index 867d166edb47..e982cd6a13b7 100644
--- a/ext/dom/node.c
+++ b/ext/dom/node.c
@@ -2331,7 +2331,11 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{
bytes = xmlOutputBufferClose(buf);
if (mode == 1 && (ret >= 0)) {
- RETURN_LONG(bytes);
+ if (bytes < 0) {
+ RETVAL_FALSE;
+ } else {
+ RETVAL_LONG(bytes);
+ }
}
}
diff --git a/ext/dom/tests/modern/xml/gh25434.phpt b/ext/dom/tests/modern/xml/gh25434.phpt
new file mode 100644
index 000000000000..22d8e8b3b79a
--- /dev/null
+++ b/ext/dom/tests/modern/xml/gh25434.phpt
@@ -0,0 +1,22 @@
+--TEST--
+GH-25434 (C14NFile() on a Dom\XMLDocument leaves the document changed and leaks memory)
+--CREDITS--
+Wonseok Oh (marinelay)
+--EXTENSIONS--
+dom
+--FILE--
+');
+var_dump($doc->C14NFile(__DIR__ . '/gh25434.xml'));
+echo file_get_contents(__DIR__ . '/gh25434.xml'), "\n";
+echo $doc->saveXml(), "\n";
+?>
+--CLEAN--
+
+--EXPECT--
+int(48)
+
+
+