projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
native_client_sdk
/
src
/
libraries
/
nacl_io
/
socket
/
packet.cc
diff --git
a/src/native_client_sdk/src/libraries/nacl_io/socket/packet.cc
b/src/native_client_sdk/src/libraries/nacl_io/socket/packet.cc
index
f437d09
..
69a894f
100644
(file)
--- a/
src/native_client_sdk/src/libraries/nacl_io/socket/packet.cc
+++ b/
src/native_client_sdk/src/libraries/nacl_io/socket/packet.cc
@@
-4,6
+4,7
@@
#include "nacl_io/socket/packet.h"
#include "nacl_io/socket/packet.h"
+#include <assert.h>
#include <string.h>
#include "nacl_io/pepper_interface.h"
#include <string.h>
#include "nacl_io/pepper_interface.h"
@@
-17,19
+18,14
@@
Packet::Packet(PepperInterface* ppapi)
Packet::~Packet() {
if ((NULL != ppapi_) && addr_)
ppapi_->ReleaseResource(addr_);
Packet::~Packet() {
if ((NULL != ppapi_) && addr_)
ppapi_->ReleaseResource(addr_);
- delete[] buffer_;
-}
-
-void Packet::Take(const void* buffer, size_t len, PP_Resource addr) {
- addr_ = addr;
- len_ = len;
- buffer_ = static_cast<char*>(const_cast<void*>(buffer));
+ free(buffer_);
}
void Packet::Copy(const void* buffer, size_t len, PP_Resource addr) {
addr_ = addr;
len_ = len;
}
void Packet::Copy(const void* buffer, size_t len, PP_Resource addr) {
addr_ = addr;
len_ = len;
- buffer_ = new char[len];
+ buffer_ = (char*)malloc(len);
+ assert(buffer_);
memcpy(buffer_, buffer, len);
if (addr && (NULL != ppapi_))
memcpy(buffer_, buffer, len);
if (addr && (NULL != ppapi_))