Add more NULL checks in proxy.

ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "native_client/src/shared/ppapi_proxy/browser_globals.h"
 
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ skipping 38 matching lines @@
 PPB_GetInterface get_interface = NULL;
 bool enable_dev_interfaces = false;
 
 // Whether Pepper 3D interfaces should be enabled.
 bool enable_3d_interfaces = true;
 
 }  // namespace
 
 void SetBrowserPppForInstance(PP_Instance instance, BrowserPpp* browser_ppp) {
   // If there was no map, create one.
-  if (instance_to_ppp_map == NULL) {
+  if (NULL == instance_to_ppp_map) {
     instance_to_ppp_map = new std::map<PP_Instance, BrowserPpp*>;
   }
   // Add the instance to the map.
   (*instance_to_ppp_map)[instance] = browser_ppp;
 }
 
 void UnsetBrowserPppForInstance(PP_Instance instance) {
-  if (instance_to_ppp_map == NULL) {
+  if (NULL == instance_to_ppp_map) {
     // Something major is wrong here.  We are deleting a map entry
     // when there is no map.
     NACL_NOTREACHED();
     return;
   }
   // Erase the instance from the map.
   instance_to_ppp_map->erase(instance);
   // If there are no more instances alive, remove the map.
   if (instance_to_ppp_map->size() == 0) {
     delete instance_to_ppp_map;
     instance_to_ppp_map = NULL;
   }
 }
 
 BrowserPpp* LookupBrowserPppForInstance(PP_Instance instance) {
-  if (instance_to_ppp_map == NULL) {
+  if (NULL == instance_to_ppp_map) {
     return NULL;
   }
   return (*instance_to_ppp_map)[instance];
 }
 
 void SetModuleIdForSrpcChannel(NaClSrpcChannel* channel, PP_Module module_id) {
   // If there was no map, create one.
-  if (channel_to_module_id_map == NULL) {
+  if (NULL == channel_to_module_id_map) {
     channel_to_module_id_map = new std::map<NaClSrpcChannel*, PP_Module>;
   }
   // Add the channel to the map.
   (*channel_to_module_id_map)[channel] = module_id;
 }
 
 void SetInstanceIdForSrpcChannel(NaClSrpcChannel* channel,
                                  PP_Instance instance_id) {
-  if (channel_to_instance_id_map == NULL) {
+  if (NULL == channel_to_instance_id_map) {
     channel_to_instance_id_map = new std::map<NaClSrpcChannel*, PP_Instance>;
   }
   (*channel_to_instance_id_map)[channel] = instance_id;
 }
 
 void UnsetModuleIdForSrpcChannel(NaClSrpcChannel* channel) {
-  if (channel_to_module_id_map == NULL) {
+  if (NULL == channel_to_module_id_map) {
     // Something major is wrong here.  We are deleting a map entry
     // when there is no map.
     NACL_NOTREACHED();
     return;
   }
   // Erase the channel from the map.
   channel_to_module_id_map->erase(channel);
   // If there are no more channels alive, remove the map.
   if (channel_to_module_id_map->size() == 0) {
     delete channel_to_module_id_map;
     channel_to_module_id_map = NULL;
   }
 }
 
 void UnsetInstanceIdForSrpcChannel(NaClSrpcChannel* channel) {
-  if (channel_to_instance_id_map == NULL) {
+  if (NULL == channel_to_instance_id_map) {
     NACL_NOTREACHED();
     return;
   }
   channel_to_instance_id_map->erase(channel);
   if (channel_to_instance_id_map->size() == 0) {
     delete channel_to_module_id_map;
     channel_to_module_id_map = NULL;
   }
 }
 
 PP_Module LookupModuleIdForSrpcChannel(NaClSrpcChannel* channel) {
-  if (channel_to_module_id_map == NULL) {
+  if (NULL == channel_to_module_id_map) {
     return 0;
   }
   return (*channel_to_module_id_map)[channel];
 }
 
 PP_Module LookupInstanceIdForSrpcChannel(NaClSrpcChannel* channel) {
-  if (channel_to_instance_id_map == NULL) {
+  if (NULL == channel_to_instance_id_map) {
     return 0;
   }
   return (*channel_to_instance_id_map)[channel];
 }
 
 NaClSrpcChannel* GetMainSrpcChannel(NaClSrpcRpc* upcall_rpc) {
   // The upcall channel's server_instance_data member is initialized to point
   // to the main channel for this instance.  Here it is retrieved to use in
   // constructing a RemoteCallbackInfo.
   return static_cast<NaClSrpcChannel*>(
       upcall_rpc->channel->server_instance_data);
 }
 
 NaClSrpcChannel* GetMainSrpcChannel(PP_Instance instance) {
-  return LookupBrowserPppForInstance(instance)->main_channel();
+  BrowserPpp* proxy = LookupBrowserPppForInstance(instance);
+  if (NULL == proxy)
+    return NULL;
+  return proxy->main_channel();
 }
 
 void CleanUpAfterDeadNexe(PP_Instance instance) {
   DebugPrintf("CleanUpAfterDeadNexe\n");
   BrowserPpp* proxy = LookupBrowserPppForInstance(instance);
-  if (proxy == NULL)
+  if (NULL == proxy)
     return;
   proxy->plugin()->ReportDeadNexe();  // Shuts down and deletes the proxy.
 }
 
 void SetPPBGetInterface(PPB_GetInterface get_interface_function,
                         bool allow_dev_interfaces,
                         bool allow_3d_interfaces) {
   get_interface = get_interface_function;
   enable_dev_interfaces = allow_dev_interfaces;
   enable_3d_interfaces = allow_3d_interfaces;
@@ skipping 26 matching lines @@
     for (size_t i = 0; i < NACL_ARRAY_SIZE(disabled_interface_names); i++) {
       if (strcmp(interface_name, disabled_interface_names[i]) == 0)
         return NULL;
     }
   }
   return (*get_interface)(interface_name);
 }
 
 const void* GetBrowserInterfaceSafe(const char* interface_name) {
   const void* ppb_interface = GetBrowserInterface(interface_name);
-  if (ppb_interface == NULL)
+  if (NULL == ppb_interface)
     DebugPrintf("PPB_GetInterface: %s not found\n", interface_name);
-  CHECK(ppb_interface != NULL);
+  CHECK(NULL != ppb_interface);
   return ppb_interface;
 }
 
 const PPB_Core* PPBCoreInterface() {
   static const PPB_Core* ppb = static_cast<const PPB_Core*>(
       GetBrowserInterfaceSafe(PPB_CORE_INTERFACE));
   return ppb;
 }
 
 const PPB_Graphics2D* PPBGraphics2DInterface() {
@@ skipping 251 matching lines @@
 }
 
 const PPB_UDPSocket_Private* PPBUDPSocketPrivateInterface() {
   static const PPB_UDPSocket_Private* ppb =
       static_cast<const PPB_UDPSocket_Private*>(
           GetBrowserInterfaceSafe(PPB_UDPSOCKET_PRIVATE_INTERFACE));
   return ppb;
 }
 
 }  // namespace ppapi_proxy