summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2015-08-27 22:15:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 22:15:02 +0000
commit4e861bf5d43eae00ae4cb8727c5a408c3728288b (patch)
tree7bafa996c1309cf7af7c96a7f6ec47b7a9c07f20
parentff9a97f62344dc318b90c5b62ae3c7d3be5ab90e (diff)
parente1dc15ecfaa5bbbda28647749bad51e6d18d0c79 (diff)
downloadframeworks_av-4e861bf5d43eae00ae4cb8727c5a408c3728288b.zip
frameworks_av-4e861bf5d43eae00ae4cb8727c5a408c3728288b.tar.gz
frameworks_av-4e861bf5d43eae00ae4cb8727c5a408c3728288b.tar.bz2
am e1dc15ec: am 762c7139: am b04cfdf5: am d437c777: am 0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit 'e1dc15ecfaa5bbbda28647749bad51e6d18d0c79': IMediaPlayer.cpp: make sure structures are initialized to 0
-rw-r--r--media/libmedia/IMediaPlayer.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libmedia/IMediaPlayer.cpp b/media/libmedia/IMediaPlayer.cpp
index d778d05..aa22b58 100644
--- a/media/libmedia/IMediaPlayer.cpp
+++ b/media/libmedia/IMediaPlayer.cpp
@@ -525,6 +525,7 @@ status_t BnMediaPlayer::onTransact(
CHECK_INTERFACE(IMediaPlayer, data, reply);
struct sockaddr_in endpoint;
+ memset(&endpoint, 0, sizeof(endpoint));
int amt = data.readInt32();
if (amt == sizeof(endpoint)) {
data.read(&endpoint, sizeof(struct sockaddr_in));
@@ -539,6 +540,7 @@ status_t BnMediaPlayer::onTransact(
CHECK_INTERFACE(IMediaPlayer, data, reply);
struct sockaddr_in endpoint;
+ memset(&endpoint, 0, sizeof(endpoint));
status_t res = getRetransmitEndpoint(&endpoint);
reply->writeInt32(res);