From 1978500e8ffb8ffdffd2d2969cbafb6f43b9dde4 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 14 Aug 2014 23:05:19 -0700
Subject: pkcs1 to pkcs8 key conversion - this is a lot easier than parsing
 ASN.1 DER formats and rebuilding the darn things like we used to do. Check
 for illegal hex encoded album names in mod/photo so we don't throw php
 errors. Don't know where they come from but we get a lot of them.

---
 mod/photos.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'mod/photos.php')

diff --git a/mod/photos.php b/mod/photos.php
index c43beb8d4..86e027bab 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -618,6 +618,11 @@ function photos_content(&$a) {
 
 	if($datatype === 'album') {
 
+		if((strlen($datum) & 1) || (! ctype_xdigit($datum))) {
+			notice( t('Album name could not be decoded') . EOL);
+			$datum = '';
+		}
+
 		$album = hex2bin($datum);
 
 		$r = q("SELECT `resource_id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' 
-- 
cgit v1.2.3