From 7825704bd6c1ec0cd688821b76f511db0db88cca Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 27 Dec 2015 03:54:20 +0100 Subject: [PATCH] Diaspora: Fixed possible SQL injection --- include/diaspora.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index e0eaf065d6..155e07b39f 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -804,7 +804,7 @@ function diaspora_is_redmatrix($url) { } function diaspora_plink($addr, $guid) { - $r = q("SELECT `url`, `nick`, `network` FROM `fcontact` WHERE `addr`='%s' LIMIT 1", $addr); + $r = q("SELECT `url`, `nick`, `network` FROM `fcontact` WHERE `addr`='%s' LIMIT 1", dbesc($addr)); // Fallback if (!$r) @@ -2361,9 +2361,9 @@ function diaspora_signed_retraction($importer,$xml,$msg) { // The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always // return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent. // The only item with `parent` and `id` as the parent id is the parent item. - $p = q("select origin from item where parent = %d and id = %d limit 1", - $r[0]['parent'], - $r[0]['parent'] + $p = q("SELECT `origin` FROM `item` WHERE `parent` = %d AND `id` = %d LIMIT 1", + intval($r[0]['parent']), + intval($r[0]['parent']) ); if(count($p)) { if(($p[0]['origin']) && (! $parent_author_signature)) {