--- squashfs-tools/xattr.c.orig	2019-10-15 16:00:58.316689601 +0000
+++ squashfs-tools/xattr.c	2019-10-15 16:03:43.160026468 +0000
@@ -643,7 +643,7 @@
 
 	res = read_xattrs_from_disk(fd, sBlk, FALSE, NULL);
 	if(res == SQUASHFS_INVALID_BLK || res == 0)
-		goto done;
+		return res;
 	ids = res;
 
 	/*
@@ -664,13 +664,11 @@
 		 */
 		if(id != i) {
 			ERROR("BUG, different xattr_id in get_xattrs\n");
-			res = 0;
-			goto done;
+			return FALSE;
 		}
 	}
 
-done:
-	return res;
+	return TRUE;
 }