commit 293b27e458d3c932193109578be50f478737b59b
author Stephen Hines <srhines@google.com> Wed Nov 02 17:29:30 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 02 17:29:30 2011 +0000
tree ca09196888efc5fa9bce03a17a6d781ef49f761f
parent 3fb5048b02b01b6f5edc517ad5fb8aec79b67751
parent af3a854b549409c4ad77c686e860f97ea86706a0

am af3a854b: am af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0

* commit 'af3a854b549409c4ad77c686e860f97ea86706a0':
  Fix potential segfault in RS watchdog.

libs/rs/rsContext.cpp

diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp
index 43f6049..f8213a1 100644
--- a/libs/rs/rsContext.cpp
+++ b/libs/rs/rsContext.cpp
@@ -359,6 +359,7 @@
     mTargetSdkVersion = 14;
     mDPI = 96;
     mIsContextLite = false;
+    memset(&watchdog, 0, sizeof(watchdog));
 }
 
 Context * Context::createContext(Device *dev, const RsSurfaceConfig *sc) {