mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 12:18:46 +00:00
Code Issues Projects Releases Wiki Activity

Filesystem::safeFilePutContents() now consistently throws RuntimeException in all expected failure cases

Browse Source 
unexpected cases may still throw ErrorException (such as undefined variables) but we don't want to capture those.
This commit is contained in:
Dylan K. Taylor 2022-01-09 16:33:31 +00:00
parent fd880d8465
commit a5c0958adf
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Server.php
View File

@ -545,7 +545,7 @@ class Server{
$contents = Utils::assumeNotFalse(zlib_encode($nbt->write(new TreeRoot($ev->getSaveData())), ZLIB_ENCODING_GZIP), "zlib_encode() failed unexpectedly");
try{
Filesystem::safeFilePutContents($this->getPlayerDataPath($name), $contents);
}catch(\RuntimeException | \ErrorException $e){
}catch(\RuntimeException $e){
$this->logger->critical($this->getLanguage()->translate(KnownTranslationFactory::pocketmine_data_saveError($name, $e->getMessage())));
$this->logger->logException($e);
}

20
src/utils/Filesystem.php
View File

@ -27,7 +27,6 @@ use pocketmine\errorhandler\ErrorToExceptionHandler;
use Webmozart\PathUtil\Path;
use function copy;
use function dirname;
use function disk_free_space;
use function fclose;
use function fflush;
use function file_exists;
@ -236,6 +235,8 @@ final class Filesystem{
* new contents.
*
* @param resource|null $context Context to pass to file_put_contents
*
* @throws \RuntimeException if the operation failed for any reason
*/
public static function safeFilePutContents(string $fileName, string $contents, int $flags = 0, $context = null) : void{
$directory = dirname($fileName);
@ -253,19 +254,16 @@ final class Filesystem{
$counter++;
}while(is_dir($temporaryFileName));
$writeTemporaryFileResult = $context !== null ?
file_put_contents($temporaryFileName, $contents, $flags, $context) :
file_put_contents($temporaryFileName, $contents, $flags);
if($writeTemporaryFileResult !== strlen($contents)){
try{
ErrorToExceptionHandler::trap(fn() => $context !== null ?
file_put_contents($temporaryFileName, $contents, $flags, $context) :
file_put_contents($temporaryFileName, $contents, $flags)
);
}catch(\ErrorException $filePutContentsException){
$context !== null ?
@unlink($temporaryFileName, $context) :
@unlink($temporaryFileName);
$diskSpace = disk_free_space($directory);
if($diskSpace !== false && $diskSpace < strlen($contents)){
throw new \RuntimeException("Failed to write to temporary file $temporaryFileName (out of free disk space)");
}
throw new \RuntimeException("Failed to write to temporary file $temporaryFileName (possibly out of free disk space)");
throw new \RuntimeException("Failed to write to temporary file $temporaryFileName: " . $filePutContentsException->getMessage(), 0, $filePutContentsException);
}
$renameTemporaryFileResult = $context !== null ?