Merge pull request #166 from guillaumelecerf/sanity_check

EZP-23203: Improve handling of unexpected Solr response
ezsystems · Jul 28, 2014 · c379e4c · c379e4c
2 parents 4c4ca9b + 7ed0c05
commit c379e4c
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/search/plugins/ezsolr/ezsolr.php b/search/plugins/ezsolr/ezsolr.php
@@ -1498,6 +1498,15 @@ protected function buildResultObjects( $resultArray, &$searchCount, $asObjects =
         if ( !empty( $resultArray ) )
         {
             $result = $resultArray['response'];
+            if ( !is_array( $result ) ||
+                 !isset( $result['maxScore'] ) ||
+                 !isset( $result['docs'] ) ||
+                 !is_array( $result['docs'] ) )
+            {
+                eZDebug::writeError( 'Unexpected response from Solr: ' . var_export( $result, true ), __METHOD__ );
+                return $objectRes;
+            }
+
             $maxScore = $result['maxScore'];
             $docs = $result['docs'];
             $localNodeIDList = array();