Merge pull request #184 from Koromix/fix_ub_function_pointer_cast

utelle · web-flow · commit 08edcd9650e7 · 2024-12-10T15:22:20.000+01:00
Fix undefined behavior related to function pointer cast
diff --git a/src/cipher_common.c b/src/cipher_common.c
@@ -116,8 +116,9 @@ sqlite3mcCloneCodecParameterTable()
 }
 
 SQLITE_PRIVATE void
-sqlite3mcFreeCodecParameterTable(CodecParameter* codecParams)
+sqlite3mcFreeCodecParameterTable(void* ptr)
 {
+  CodecParameter* codecParams = (CodecParameter*)ptr;
   sqlite3_free(codecParams[0].m_params);
   sqlite3_free(codecParams);
 }
diff --git a/src/sqlite3mc.c b/src/sqlite3mc.c
@@ -409,7 +409,7 @@ mcRegisterCodecExtensions(sqlite3* db, char** pzErrMsg, const sqlite3_api_routin
   if (rc == SQLITE_OK)
   {
     rc = sqlite3_create_function_v2(db, "sqlite3mc_config_table", 0, SQLITE_UTF8 | SQLITE_DETERMINISTIC,
-                                    codecParameterTable, sqlite3mcConfigTable, 0, 0, (void(*)(void*)) sqlite3mcFreeCodecParameterTable);
+                                    codecParameterTable, sqlite3mcConfigTable, 0, 0, sqlite3mcFreeCodecParameterTable);
   }
 
   rc = (codecParameterTable != NULL) ? SQLITE_OK : SQLITE_NOMEM;

Original file line number	Diff line number	Diff line change
`@@ -116,8 +116,9 @@ sqlite3mcCloneCodecParameterTable()`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`SQLITE_PRIVATE void`
`119`		`-sqlite3mcFreeCodecParameterTable(CodecParameter* codecParams)`
	`119`	`+sqlite3mcFreeCodecParameterTable(void* ptr)`
`120`	`120`	`{`
	`121`	`+ CodecParameter* codecParams = (CodecParameter*)ptr;`
`121`	`122`	`sqlite3_free(codecParams[0].m_params);`
`122`	`123`	`sqlite3_free(codecParams);`
`123`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ mcRegisterCodecExtensions(sqlite3* db, char** pzErrMsg, const sqlite3_api_routin`
`409`	`409`	`if (rc == SQLITE_OK)`
`410`	`410`	`{`
`411`	`411`	`rc = sqlite3_create_function_v2(db, "sqlite3mc_config_table", 0, SQLITE_UTF8 \| SQLITE_DETERMINISTIC,`
`412`		`- codecParameterTable, sqlite3mcConfigTable, 0, 0, (void()(void)) sqlite3mcFreeCodecParameterTable);`
	`412`	`+ codecParameterTable, sqlite3mcConfigTable, 0, 0, sqlite3mcFreeCodecParameterTable);`
`413`	`413`	`}`
`414`	`414`
`415`	`415`	`rc = (codecParameterTable != NULL) ? SQLITE_OK : SQLITE_NOMEM;`