opensourcemirror
/
tinytinyrss
mirror of https://git.tt-rss.org/fox/tt-rss.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix crash caused by non-numeric non-null _SESSION[uid] passed to sql logger

This commit is contained in:
Andrew Dolgov 2021-02-25 18:21:48 +03:00
parent 34c74400a4
commit 8915bd1b21
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/logger.php
View File

@ -38,7 +38,7 @@ class Logger {
return self::get_instance()->_log($errno, $errstr, $context);
}
private function _log($errno, $errstr, $context = "") {
private function _log(int $errno, string $errstr, $context = "") {
if ($this->adapter)
return $this->adapter->log_error($errno, $errstr, '', 0, $context);
else

6
classes/logger/sql.php
View File

@ -32,10 +32,14 @@ class Logger_SQL implements Logger_Adapter {
$errstr = UConverter::transcode($errstr, 'UTF-8', 'UTF-8');
$context = UConverter::transcode($context, 'UTF-8', 'UTF-8');
// can't use $_SESSION["uid"] ?? null because what if its, for example, false? or zero?
// this would cause a PDOException on insert below
$owner_uid = !empty($_SESSION["uid"]) ? $_SESSION["uid"] : null;
$sth = $this->pdo->prepare("INSERT INTO ttrss_error_log
(errno, errstr, filename, lineno, context, owner_uid, created_at) VALUES
(?, ?, ?, ?, ?, ?, NOW())");
$sth->execute([$errno, $errstr, $file, $line, $context, $_SESSION["uid"] ?? null]);
$sth->execute([$errno, $errstr, $file, (int)$line, $context, $owner_uid]);
return $sth->rowCount();
}

3
classes/userhelper.php
View File

@ -97,7 +97,8 @@ class UserHelper {
startup_gettext();
self::load_user_plugins($_SESSION["uid"]);
} else {
if (!\Sessions\validate_session()) $_SESSION["uid"] = false;
if (!\Sessions\validate_session())
$_SESSION["uid"] = null;
if (empty($_SESSION["uid"])) {