diff options
| author | Stephen Hines <srhines@google.com> | 2011-11-01 00:16:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-01 00:16:56 +0000 |
| commit | af3a854b549409c4ad77c686e860f97ea86706a0 (patch) | |
| tree | d42f4c9a28d401a87ed6291a5439d710df98850d /libs | |
| parent | cd84197ac1226432de2e13c8fd678a4c88511e0f (diff) | |
| parent | af675222f6340a8a9edbe9e8635014a18521e5e0 (diff) | |
| download | frameworks_base-af3a854b549409c4ad77c686e860f97ea86706a0.zip frameworks_base-af3a854b549409c4ad77c686e860f97ea86706a0.tar.gz frameworks_base-af3a854b549409c4ad77c686e860f97ea86706a0.tar.bz2 | |
am af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0
* commit 'af675222f6340a8a9edbe9e8635014a18521e5e0':
Fix potential segfault in RS watchdog.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/rs/rsContext.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp index 948ecf9..5291a1f 100644 --- a/libs/rs/rsContext.cpp +++ b/libs/rs/rsContext.cpp @@ -359,6 +359,7 @@ Context::Context() { mTargetSdkVersion = 14; mDPI = 96; mIsContextLite = false; + memset(&watchdog, 0, sizeof(watchdog)); } Context * Context::createContext(Device *dev, const RsSurfaceConfig *sc) { |