Resolve crash when signature that is removed is not at the end of the…

… list. Also manipulate ptr level list rather than the items themselves.
rhboot · Jun 22, 2020 · e0ea290 · e0ea290
1 parent 23f2074
commit e0ea290
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/actions.c b/src/actions.c
@@ -446,11 +446,12 @@ remove_signature(pesign_context *p_ctx)
 	cms_context *ctx = p_ctx->cms_ctx;
 
 	free(ctx->signatures[p_ctx->signum]->data);
+	free(ctx->signatures[p_ctx->signum]);
 	if (p_ctx->signum != ctx->num_signatures - 1)
-		memmove(ctx->signatures[p_ctx->signum],
-			ctx->signatures[p_ctx->signum+1],
-			sizeof(SECItem) *
-				(ctx->num_signatures - 1));
+		memmove(&ctx->signatures[p_ctx->signum],
+			&ctx->signatures[p_ctx->signum+1],
+			sizeof(SECItem*) *
+				(ctx->num_signatures - p_ctx->signum - 1));
 
 	ctx->num_signatures--;
 }