瀏覽代碼

libobs/callback: Set default return values to 0/NULL

These functions created stack variables but never actually initialized
them.  If the calldata variable is invalid, the return values will be
the uninitialized stack value.
jp9000 10 年之前
父節點
當前提交
d1f225e2e8
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      libobs/callback/calldata.h

+ 2 - 2
libobs/callback/calldata.h

@@ -131,7 +131,7 @@ static inline bool calldata_bool(const calldata_t *data, const char *name)
 
 
 static inline void *calldata_ptr(const calldata_t *data, const char *name)
 static inline void *calldata_ptr(const calldata_t *data, const char *name)
 {
 {
-	void *val;
+	void *val = NULL;
 	calldata_get_ptr(data, name, &val);
 	calldata_get_ptr(data, name, &val);
 	return val;
 	return val;
 }
 }
@@ -139,7 +139,7 @@ static inline void *calldata_ptr(const calldata_t *data, const char *name)
 static inline const char *calldata_string(const calldata_t *data,
 static inline const char *calldata_string(const calldata_t *data,
 		const char *name)
 		const char *name)
 {
 {
-	const char *val;
+	const char *val = NULL;
 	calldata_get_string(data, name, &val);
 	calldata_get_string(data, name, &val);
 	return val;
 	return val;
 }
 }