Skip to content

Commit 626de87

Browse files
committed
Added file pointer check
1 parent 4d393d6 commit 626de87

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

thumb.php

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
die('File is not an image');
6262
}
6363

64-
$file_salt = 'v1.0.1';
64+
$file_salt = 'v1.0.2';
6565
$file_size = filesize($src);
6666
$file_time = filemtime($src);
6767
$file_date = gmdate('D, d M Y H:i:s T', $file_time);
@@ -72,22 +72,23 @@
7272
if (!file_exists(THUMB_CACHE . 'index.html')) {
7373
touch(THUMB_CACHE . 'index.html');
7474
}
75-
$fp = fopen(THUMB_CACHE . 'index.html', 'r');
76-
if (flock($fp, LOCK_EX)) {
77-
if (time() - THUMB_CACHE_AGE > filemtime(THUMB_CACHE . 'index.html')) {
78-
$files = glob(THUMB_CACHE . '*.img.txt');
79-
if (is_array($files) && count($files) > 0) {
80-
foreach ($files as $file) {
81-
if (time() - THUMB_CACHE_AGE > filemtime($file)) {
82-
unlink($file);
75+
if (($fp = fopen(THUMB_CACHE . 'index.html', 'r')) !== false) {
76+
if (flock($fp, LOCK_EX)) {
77+
if (time() - THUMB_CACHE_AGE > filemtime(THUMB_CACHE . 'index.html')) {
78+
$files = glob(THUMB_CACHE . '*.img.txt');
79+
if (is_array($files) && count($files) > 0) {
80+
foreach ($files as $file) {
81+
if (time() - THUMB_CACHE_AGE > filemtime($file)) {
82+
unlink($file);
83+
}
8384
}
8485
}
86+
touch(THUMB_CACHE . 'index.html');
8587
}
86-
touch(THUMB_CACHE . 'index.html');
88+
flock($fp, LOCK_UN);
8789
}
88-
flock($fp, LOCK_UN);
90+
fclose($fp);
8991
}
90-
fclose($fp);
9192

9293
if (THUMB_BROWSER_CACHE && (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || isset($_SERVER['HTTP_IF_NONE_MATCH']))) {
9394
if ($_SERVER['HTTP_IF_MODIFIED_SINCE'] == $file_date && $_SERVER['HTTP_IF_NONE_MATCH'] == $file_hash) {

0 commit comments

Comments
 (0)