diff options
| author | Naveen Leekha <leekha@google.com> | 2015-09-22 17:58:21 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2015-09-28 16:30:48 -0700 |
| commit | 2beb44cc2f8d123fefa25bc2c8f6956622a70b48 (patch) | |
| tree | 2ea2832f63e63b8f7f8a3a0dc7ef727f85bd6556 | |
| parent | e68cbc3e9e66df4231e70efa3e9c41abc12aea20 (diff) | |
| download | frameworks_native-2beb44cc2f8d123fefa25bc2c8f6956622a70b48.zip frameworks_native-2beb44cc2f8d123fefa25bc2c8f6956622a70b48.tar.gz frameworks_native-2beb44cc2f8d123fefa25bc2c8f6956622a70b48.tar.bz2 | |
Initialize local variables to avoid data leak
The uninitialized local variables pick up
whatever the memory content was there on stack.
This data gets sent to the remote process in
case of a failed transaction, which is a security
issue. Fixed.
(Manual merge of master change
12ba0f57d028a9c8f4eb3afddc326b70677d1e0c )
For b/23696300
Change-Id: I665212d10da56f0803b5bb772d14c77e632ba2ab
| -rw-r--r-- | libs/gui/IGraphicBufferProducer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/gui/IGraphicBufferProducer.cpp b/libs/gui/IGraphicBufferProducer.cpp index 1e28f9b..75c7cfc 100644 --- a/libs/gui/IGraphicBufferProducer.cpp +++ b/libs/gui/IGraphicBufferProducer.cpp @@ -304,7 +304,7 @@ status_t BnGraphicBufferProducer::onTransact( uint32_t h = data.readInt32(); uint32_t format = data.readInt32(); uint32_t usage = data.readInt32(); - int buf; + int buf = 0; sp<Fence> fence; int result = dequeueBuffer(&buf, &fence, async, w, h, format, usage); reply->writeInt32(buf); @@ -371,7 +371,7 @@ status_t BnGraphicBufferProducer::onTransact( } break; case QUERY: { CHECK_INTERFACE(IGraphicBufferProducer, data, reply); - int value; + int value = 0; int what = data.readInt32(); int res = query(what, &value); reply->writeInt32(value); |