summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/native_client/src/shared/ppapi_proxy/ppp_instance_combined.cc4
-rw-r--r--ppapi/native_client/src/trusted/plugin/module_ppapi.cc6
2 files changed, 7 insertions, 3 deletions
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppp_instance_combined.cc b/ppapi/native_client/src/shared/ppapi_proxy/ppp_instance_combined.cc
index b3af590..054c2ec 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/ppp_instance_combined.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/ppp_instance_combined.cc
@@ -1,16 +1,18 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "ppapi/native_client/src/shared/ppapi_proxy/ppp_instance_combined.h"
#include <stdlib.h>
+#include <string.h>
namespace ppapi_proxy {
PPP_Instance_Combined::PPP_Instance_Combined()
: initialized_(false),
did_change_view_1_0_(NULL) {
+ memset(&instance_1_1_, 0, sizeof(instance_1_1_));
}
void PPP_Instance_Combined::Init1_0(const PPP_Instance_1_0* instance_if) {
diff --git a/ppapi/native_client/src/trusted/plugin/module_ppapi.cc b/ppapi/native_client/src/trusted/plugin/module_ppapi.cc
index 6cde6b8c..bb2acfd 100644
--- a/ppapi/native_client/src/trusted/plugin/module_ppapi.cc
+++ b/ppapi/native_client/src/trusted/plugin/module_ppapi.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 The Chromium Authors. All rights reserved.
+ * 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.
*/
@@ -19,7 +19,9 @@ namespace plugin {
class ModulePpapi : public pp::Module {
public:
- ModulePpapi() : pp::Module(), init_was_successful_(false) {
+ ModulePpapi() : pp::Module(),
+ init_was_successful_(false),
+ private_interface_(NULL) {
MODULE_PRINTF(("ModulePpapi::ModulePpapi (this=%p)\n",
static_cast<void*>(this)));
}