diff options
author | Stephen Hines <srhines@google.com> | 2011-11-02 17:29:30 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-02 17:29:30 +0000 |
commit | 532165d1bca92d4d829ac878371474125694792e (patch) | |
tree | 52181d3f31169f8b7bab5cf1180761115a74708d /rsContext.cpp | |
parent | 74c4d4013fe9d41784994681d4c752d3c49b5ec6 (diff) | |
parent | 237f4c9f814f0c9db3e00e445f20c77791138f86 (diff) | |
download | rs-532165d1bca92d4d829ac878371474125694792e.tar.gz |
am af3a854b: am af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0
* commit 'af3a854b549409c4ad77c686e860f97ea86706a0':
Fix potential segfault in RS watchdog.
Diffstat (limited to 'rsContext.cpp')
-rw-r--r-- | rsContext.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/rsContext.cpp b/rsContext.cpp index 43f60493..f8213a1d 100644 --- a/rsContext.cpp +++ b/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) { |