From 1cb9da7a149166a5bbb8c07bf4a415882f716160 Mon Sep 17 00:00:00 2001 From: Erich Lerch Date: Wed, 16 Oct 2013 01:09:27 +0200 Subject: [PATCH] Escape backslashes in image metadata Uploading a file with backslashes in the metadata causes database exception on PostgreSQL, because backslashes are sent to the 'bytea' datatype unencoded. Bug: 52017 Change-Id: Ife56cffe3df83ec1a7bd39cdc4a0489f23354494 --- includes/filerepo/file/LocalFile.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php index 627defd3fc..0c34f3e4f7 100644 --- a/includes/filerepo/file/LocalFile.php +++ b/includes/filerepo/file/LocalFile.php @@ -539,7 +539,7 @@ class LocalFile extends File { 'img_media_type' => $this->media_type, 'img_major_mime' => $major, 'img_minor_mime' => $minor, - 'img_metadata' => $this->metadata, + 'img_metadata' => $dbw->encodeBlob($this->metadata), 'img_sha1' => $this->sha1, ), array( 'img_name' => $this->getName() ), @@ -1225,7 +1225,7 @@ class LocalFile extends File { 'img_description' => $comment, 'img_user' => $user->getId(), 'img_user_text' => $user->getName(), - 'img_metadata' => $this->metadata, + 'img_metadata' => $dbw->encodeBlob($this->metadata), 'img_sha1' => $this->sha1 ), __METHOD__, @@ -1276,7 +1276,7 @@ class LocalFile extends File { 'img_description' => $comment, 'img_user' => $user->getId(), 'img_user_text' => $user->getName(), - 'img_metadata' => $this->metadata, + 'img_metadata' => $dbw->encodeBlob($this->metadata), 'img_sha1' => $this->sha1 ), array( 'img_name' => $this->getName() ), -- 2.20.1