Merge "Fix potential segfault in RS watchdog." into ics-mr0

stephenhines · Android (Google) Code Review · commit af675222f634 · 2011-10-31T17:14:58.000-07:00
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -359,6 +359,7 @@ Context::Context() {`
`359`	`359`	`mTargetSdkVersion = 14;`
`360`	`360`	`mDPI = 96;`
`361`	`361`	`mIsContextLite = false;`
	`362`	`+ memset(&watchdog, 0, sizeof(watchdog));`
`362`	`363`	`}`
`363`	`364`
`364`	`365`	`Context * Context::createContext(Device dev, const RsSurfaceConfig sc) {`