diff --git a/NEWS b/NEWS index 08d33690a97..2c810370eba 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 7.3.16 +- COM: + . Fixed bug #66322 (COMPersistHelper::SaveToFile can save to wrong location). + (cmb) + - PCRE: . Fixed bug #79188 (Memory corruption in preg_replace/preg_replace_callback and unicode). (Nikita) diff --git a/ext/com_dotnet/com_persist.c b/ext/com_dotnet/com_persist.c index c782e6695cb..0fee0efd43c 100644 --- a/ext/com_dotnet/com_persist.c +++ b/ext/com_dotnet/com_persist.c @@ -398,7 +398,7 @@ CPH_METHOD(SaveToFile) RETURN_FALSE; } - olefilename = php_com_string_to_olestring(filename, strlen(fullpath), helper->codepage); + olefilename = php_com_string_to_olestring(fullpath, strlen(fullpath), helper->codepage); efree(fullpath); } res = IPersistFile_Save(helper->ipf, olefilename, remember); diff --git a/ext/com_dotnet/tests/bug66322.phpt b/ext/com_dotnet/tests/bug66322.phpt new file mode 100644 index 00000000000..de37e4fa75c --- /dev/null +++ b/ext/com_dotnet/tests/bug66322.phpt @@ -0,0 +1,24 @@ +--TEST-- +Bug #66322 (COMPersistHelper::SaveToFile can save to wrong location) +--SKIPIF-- + +--FILE-- +Documents->Add(); +$ph = new COMPersistHelper($doc); +$filename = __DIR__ . '\\..\\' . basename(__DIR__) . '\\66322.docx'; +$ph->SaveToFile($filename); +var_dump(file_exists($filename)); +$w->Quit(); +?> +--EXPECT-- +bool(true)