summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEtienne Quiel <etienne.quiel@idealo.de>2013-05-06 09:18:22 +0200
committerEtienne Quiel <etienne.quiel@idealo.de>2013-05-06 09:18:22 +0200
commitd372ca1676bca58e19d7f1892e6e80e2d7b8fe60 (patch)
tree19f66742aee4eb922c1d0b062c6c6bdd8748ac3e
parent8d89eb36d8595feb024d9217e3d91d7dd5bc868a (diff)
downloadphp-openid-d372ca1676bca58e19d7f1892e6e80e2d7b8fe60.zip
php-openid-d372ca1676bca58e19d7f1892e6e80e2d7b8fe60.tar.gz
php-openid-d372ca1676bca58e19d7f1892e6e80e2d7b8fe60.tar.bz2
included more checks for file access errors
-rw-r--r--Auth/OpenID/FileStore.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/Auth/OpenID/FileStore.php b/Auth/OpenID/FileStore.php
index 074421a..7eec791 100644
--- a/Auth/OpenID/FileStore.php
+++ b/Auth/OpenID/FileStore.php
@@ -300,13 +300,22 @@ class Auth_OpenID_FileStore extends Auth_OpenID_OpenIDStore {
return null;
}
+ if (file_exists($filename) !== true) {
+ return null;
+ }
+
$assoc_file = @fopen($filename, 'rb');
if ($assoc_file === false) {
return null;
}
- $assoc_s = fread($assoc_file, filesize($filename));
+ $filesize = filesize($filename);
+ if ($filesize === false || $filesize <= 0) {
+ return null;
+ }
+
+ $assoc_s = fread($assoc_file, $filesize);
fclose($assoc_file);
if (!$assoc_s) {