github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-20 13:24:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Exception handling for Bencode errors (#1237)

Browse source
This commit is contained in:
Cønstantine Kovalensky 2023-12-20 21:37:47 +04:00 • committed by GitHub
commit a953045aba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
library/ajax/view_torrent.php
View file

@ -28,7 +28,10 @@ if (!file_exists($filename) || !$file_contents = file_get_contents($filename)) {
$this->ajax_die($lang['ERROR_NO_ATTACHMENT'] . "\n\n" . htmlCHR($filename)); $this->ajax_die($lang['ERROR_NO_ATTACHMENT'] . "\n\n" . htmlCHR($filename));
} }
if (!$tor = \Arokettu\Bencode\Bencode::decode($file_contents, dictType: \Arokettu\Bencode\Bencode\Collection::ARRAY)) { try {
$tor = \Arokettu\Bencode\Bencode::decode($file_contents, dictType: \Arokettu\Bencode\Bencode\Collection::ARRAY);
}
catch (Exception) {
return $lang['TORFILE_INVALID']; return $lang['TORFILE_INVALID'];
} }

5
library/includes/file_list_v2.php
View file

@ -60,7 +60,10 @@ if ($bb_cfg['flist_max_files']) {
} }
} }
if (!$torrent = \Arokettu\Bencode\Bencode::decode($file_contents, dictType: \Arokettu\Bencode\Bencode\Collection::ARRAY)) { try {
$torrent = \Arokettu\Bencode\Bencode::decode($file_contents, dictType: \Arokettu\Bencode\Bencode\Collection::ARRAY);
}
catch (Exception) {
http_response_code(410); http_response_code(410);
die($lang['TORFILE_INVALID']); die($lang['TORFILE_INVALID']);
} }

10
src/Legacy/Torrent.php
View file

@ -317,7 +317,10 @@ class Torrent
$file_contents = file_get_contents($filename); $file_contents = file_get_contents($filename);
if (!$tor = \Arokettu\Bencode\Bencode::decode($file_contents, dictType: \Arokettu\Bencode\Bencode\Collection::ARRAY)) { try {
$tor = \Arokettu\Bencode\Bencode::decode($file_contents, dictType: \Arokettu\Bencode\Bencode\Collection::ARRAY);
}
catch (Exception ) {
self::torrent_error_exit($lang['TORFILE_INVALID']); self::torrent_error_exit($lang['TORFILE_INVALID']);
} }
@ -559,7 +562,10 @@ class Torrent
// Torrent decoding // Torrent decoding
$file_contents = file_get_contents($filename); $file_contents = file_get_contents($filename);
if (!$tor = \Arokettu\Bencode\Bencode::decode($file_contents, dictType: \Arokettu\Bencode\Bencode\Collection::ARRAY)) { try {
$tor = \Arokettu\Bencode\Bencode::decode($file_contents, dictType: \Arokettu\Bencode\Bencode\Collection::ARRAY);
}
catch (Exception) {
bb_die($lang['TORFILE_INVALID']); bb_die($lang['TORFILE_INVALID']);
} }