SA-CONTRIB-2010-088 follow up fix for nodereference_autocomplete_access() and content...

[project/cck.git] / content.module

diff --git a/content.module b/content.module
index 4c4b75d..c91efd0 100644 (file)
--- a/content.module
+++ b/content.module
@@ -2252,7 +2252,10 @@ function content_access($op, $field, $account = NULL, $node = NULL) {
   if (is_null($account)) {
     $account = $user;
   }
-
+  // Check for valid field data.
+  if (!isset($field['field_name'])) {
+    return FALSE;
+  }
   $access = module_invoke_all('field_access', $op, $field, $account, $node);
   foreach ($access as $value) {
     if ($value === FALSE) {