Merge branch 'fix/i2c_master_asnyc_memory_leak' into 'master'

mythbuster5 · mythbuster5 · commit a63b8471eb52 · 2024-09-27T16:17:11.000+08:00
fix(i2c_master): Fix the memory leak in the async transaction

See merge request espressif/esp-idf!33847
diff --git a/components/esp_driver_i2c/i2c_master.c b/components/esp_driver_i2c/i2c_master.c
@@ -845,7 +845,7 @@ static esp_err_t s_i2c_asynchronous_transaction(i2c_master_dev_handle_t i2c_dev,
             // Clear unused memory
             uint8_t unused_dim = I2C_STATIC_OPERATION_ARRAY_MAX - ops_dim;
             if (unused_dim != 0) {
-                memset(&i2c_master->i2c_async_ops[i2c_master->ops_prepare_idx] + sizeof(i2c_operation_t) * ops_dim, 0, sizeof(i2c_operation_t) * unused_dim);
+                memset(&i2c_master->i2c_async_ops[i2c_master->ops_prepare_idx][ops_dim], 0, sizeof(i2c_operation_t) * unused_dim);
             }
             // Record current operation and feed to transaction queue.
             ops_current = &i2c_master->i2c_async_ops[i2c_master->ops_prepare_idx][0];

Original file line number	Diff line number	Diff line change
`@@ -845,7 +845,7 @@ static esp_err_t s_i2c_asynchronous_transaction(i2c_master_dev_handle_t i2c_dev,`
`845`	`845`	`// Clear unused memory`
`846`	`846`	`uint8_t unused_dim = I2C_STATIC_OPERATION_ARRAY_MAX - ops_dim;`
`847`	`847`	`if (unused_dim != 0) {`
`848`		`- memset(&i2c_master->i2c_async_ops[i2c_master->ops_prepare_idx] + sizeof(i2c_operation_t) * ops_dim, 0, sizeof(i2c_operation_t) * unused_dim);`
	`848`	`+ memset(&i2c_master->i2c_async_ops[i2c_master->ops_prepare_idx][ops_dim], 0, sizeof(i2c_operation_t) * unused_dim);`
`849`	`849`	`}`
`850`	`850`	`// Record current operation and feed to transaction queue.`
`851`	`851`	`ops_current = &i2c_master->i2c_async_ops[i2c_master->ops_prepare_idx][0];`