Merge pull request #171 from axxel/log_remove_func-fix

fix memory corruption in gp_log_remove_func
2017-06-03 11:34:18 +02:00
parent 8b14ec11ca db56a3b4fd
commit 03e85f9b8b
1 changed files with 1 additions and 1 deletions
--- a/libgphoto2_port/libgphoto2_port/gphoto2-port-log.c
+++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-log.c
@@ -141,7 +141,7 @@ gp_log_remove_func (int id)

 	for (i=0;i<log_funcs_count;i++) {
 		if (log_funcs[i].id == id) {
-			memmove (log_funcs + i - 1, log_funcs + i, log_funcs_count - i);
+			memmove (log_funcs + i, log_funcs + i + 1, sizeof(LogFunc) * (log_funcs_count - i - 1));
 			log_funcs_count--;
 			return GP_OK;
 		}