diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-11 23:19:46 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-11 23:19:46 +0000 |
| commit | b9730780ccd9167970e0fe4cd54d85749a136c13 (patch) | |
| tree | 64c61e52becafb5345644ec0ad6e5b5132475ee9 /ppapi | |
| parent | d9d849de5940fa09f550cab69c4c1363e5b1d8d8 (diff) | |
| download | chromium_src-b9730780ccd9167970e0fe4cd54d85749a136c13.zip chromium_src-b9730780ccd9167970e0fe4cd54d85749a136c13.tar.gz chromium_src-b9730780ccd9167970e0fe4cd54d85749a136c13.tar.bz2 | |
Fix r79718 (and brettw's ignoring of my review comments).
BUG=http://crosbug.com/11878
TEST=See bug -- grooveshark shouldn't crash.
Review URL: http://codereview.chromium.org/6822039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81174 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/proxy/ppb_flash_net_connector_proxy.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ppapi/proxy/ppb_flash_net_connector_proxy.cc b/ppapi/proxy/ppb_flash_net_connector_proxy.cc index ee5a8d0..f7279d35 100644 --- a/ppapi/proxy/ppb_flash_net_connector_proxy.cc +++ b/ppapi/proxy/ppb_flash_net_connector_proxy.cc @@ -22,7 +22,8 @@ std::string NetAddressToString(const PP_Flash_NetAddress& addr) { } void StringToNetAddress(const std::string& str, PP_Flash_NetAddress* addr) { - memcpy(addr->data, str.data(), std::min(str.size(), sizeof(addr->data))); + addr->size = std::min(str.size(), sizeof(addr->data)); + memcpy(addr->data, str.data(), addr->size); } class FlashNetConnector : public PluginResource { |