mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 08:44:01 +00:00
Code Issues Projects Releases Wiki Activity

PluginBase: account for fopen() maybe returning false

Browse Source 
again, the error handler will normally take care of this, but we can't assume that the error handler is always set.
This commit is contained in:
Dylan K. Taylor 2020-04-15 13:05:41 +01:00
parent 959dd4cbf1
commit 2da8ce7a20
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pocketmine/plugin/PluginBase.php
View File

@ -28,6 +28,7 @@ use pocketmine\command\CommandSender;
use pocketmine\command\PluginIdentifiableCommand;
use pocketmine\scheduler\TaskScheduler;
use pocketmine\Server;
use pocketmine\utils\AssumptionFailedError;
use pocketmine\utils\Config;
use function dirname;
use function fclose;
@ -171,7 +172,9 @@ abstract class PluginBase implements Plugin{
public function getResource(string $filename){
$filename = rtrim(str_replace("\\", "/", $filename), "/");
if(file_exists($this->file . "resources/" . $filename)){
return fopen($this->file . "resources/" . $filename, "rb");
$resource = fopen($this->file . "resources/" . $filename, "rb");
if($resource === false) throw new AssumptionFailedError("fopen() should not fail on a file which exists");
return $resource;
}
return null;
@ -195,7 +198,10 @@ abstract class PluginBase implements Plugin{
return false;
}
$ret = stream_copy_to_stream($resource, $fp = fopen($out, "wb")) > 0;
$fp = fopen($out, "wb");
if($fp === false) throw new AssumptionFailedError("fopen() should not fail with wb flags");
$ret = stream_copy_to_stream($resource, $fp) > 0;
fclose($fp);
fclose($resource);
return $ret;