Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

[quix0rs-gnu-social.git] / lib / stompqueuemanager.php

diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index 1d9a5ad207ef4846aa7e8caf05d08dc9054fd1d1..7dd3e6961e005857bf5bbb729a2d4d11cf8ccf2f 100644 (file)
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -480,6 +480,13 @@ class StompQueueManager extends QueueManager
     {
         $host = $this->cons[$this->defaultIdx]->getServer();
         $message = unserialize($frame->body);
+
+        if ($message === false) {
+            $this->_log(LOG_ERR, "Can't unserialize frame: {$frame->body}");
+            $this->_log(LOG_ERR, "Unserializable frame length: " . strlen($frame->body));
+            return false;
+        }
+
         $site = $message['site'];
         $queue = $message['handler'];