summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-04-14 18:11:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-14 18:11:48 +0000
commit210810b644a0bad76a04bfbff8a205f3b97b90ac (patch)
tree398e5e6f9f988d0350b4637647620cc40183fbf2 /media
parent27a17103f99d23157ac80ef7d75e25a3aae788bd (diff)
parent29fe1ea4b5a1d1fc1fb87b53866901357c04c5c1 (diff)
downloadframeworks_av-210810b644a0bad76a04bfbff8a205f3b97b90ac.zip
frameworks_av-210810b644a0bad76a04bfbff8a205f3b97b90ac.tar.gz
frameworks_av-210810b644a0bad76a04bfbff8a205f3b97b90ac.tar.bz2
am 29fe1ea4: am 9829344d: Merge "media: memset sizeof argument issues"
* commit '29fe1ea4b5a1d1fc1fb87b53866901357c04c5c1': media: memset sizeof argument issues
Diffstat (limited to 'media')
-rw-r--r--media/common_time/utils.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/common_time/utils.cpp b/media/common_time/utils.cpp
index 6539171..91cf2fd 100644
--- a/media/common_time/utils.cpp
+++ b/media/common_time/utils.cpp
@@ -59,7 +59,7 @@ void serializeSockaddr(Parcel* p, const struct sockaddr_storage* addr) {
}
void deserializeSockaddr(const Parcel* p, struct sockaddr_storage* addr) {
- memset(addr, 0, sizeof(addr));
+ memset(addr, 0, sizeof(*addr));
addr->ss_family = p->readInt32();
switch(addr->ss_family) {