ed92fb125a
upstream backport: - 0005-vdso-fix-segmentation-fault-caused-by-char-pointer-a.patch * commit id: 2cb1156 feature: - 0004-criu-dump-and-restore-cpu-affinity-of-each-thread.patch * support checkpoint/restore cpu affinity - 0006-criu-add-pin-memory-method.patch * support kernel feature pin memory option Signed-off-by: fu.lin <fulin10@huawei.com>
26 lines
702 B
Diff
26 lines
702 B
Diff
From be4a5e65791d18d1e26d6299e80a65324c5fc07e Mon Sep 17 00:00:00 2001
|
|
From: lingsheng <lingsheng@huawei.com>
|
|
Date: Tue, 22 Sep 2020 14:39:22 +0800
|
|
Subject: [PATCH 2/6] Fix crit info struct unpack error
|
|
|
|
---
|
|
lib/py/images/images.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/lib/py/images/images.py b/lib/py/images/images.py
|
|
index 9c8e144..c330b97 100644
|
|
--- a/lib/py/images/images.py
|
|
+++ b/lib/py/images/images.py
|
|
@@ -171,7 +171,7 @@ class entry_handler:
|
|
|
|
while True:
|
|
buf = f.read(4)
|
|
- if buf == '':
|
|
+ if len(buf) == 0:
|
|
break
|
|
size, = struct.unpack('i', buf)
|
|
f.seek(size, 1)
|
|
--
|
|
1.8.3.1
|
|
|