From 482c9af41fa43dbe0f1e11495b5de4fe37b1a941 Mon Sep 17 00:00:00 2001 From: Shaka Huang Date: Wed, 10 Jan 2018 20:23:01 +0800 Subject: [PATCH] Fix segmentation fault MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When both keepverity and keepforceencrypt are false, ‘e’ will be freed after removing ‘verity_key’ and segmentation fault might happened in strstr(e->filename, “fstab”) Signed-off-by: Shaka Huang --- core/jni/magiskboot/ramdisk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/core/jni/magiskboot/ramdisk.c b/core/jni/magiskboot/ramdisk.c index db4eddd2a..88dabf1ce 100644 --- a/core/jni/magiskboot/ramdisk.c +++ b/core/jni/magiskboot/ramdisk.c @@ -21,6 +21,7 @@ static void cpio_patch(struct vector *v, int keepverity, int keepforceencrypt) { fprintf(stderr, "Remove [verity_key]\n"); cpio_free(e); vec_cur(v) = NULL; + continue; } } if (!keepforceencrypt) {