Skip to content

Commit 6639679

Browse files
authored
Merge pull request #1042 from onekey-sec/update_flake_lock_action
Update flake.lock
2 parents d0a276e + c2fd63b commit 6639679

File tree

5 files changed

+84
-84
lines changed

5 files changed

+84
-84
lines changed

flake.lock

+24-30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

overlay.nix

+12
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,18 @@ final: prev:
1717
--replace-fail \
1818
'aligned_offset = offset & ~(4096 - 1);' \
1919
'aligned_offset = offset & ~(sysconf(_SC_PAGESIZE) - 1);'
20+
substituteInPlace backed_block.cpp \
21+
--replace-fail \
22+
'reinterpret_cast<backed_block_list*>(calloc(sizeof(struct backed_block_list), 1));' \
23+
'reinterpret_cast<backed_block_list*>(calloc(1, sizeof(struct backed_block_list)));'
24+
substituteInPlace sparse.cpp \
25+
--replace-fail \
26+
'struct sparse_file* s = reinterpret_cast<sparse_file*>(calloc(sizeof(struct sparse_file), 1));' \
27+
'struct sparse_file* s = reinterpret_cast<sparse_file*>(calloc(1, sizeof(struct sparse_file)));'
28+
substituteInPlace simg2simg.cpp \
29+
--replace-fail \
30+
'out_s = (struct sparse_file**)calloc(sizeof(struct sparse_file*), files);' \
31+
'out_s = (struct sparse_file**)calloc(files, sizeof(struct sparse_file*));'
2032
'';
2133
});
2234

poetry.lock

+44-50
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ python-magic = "^0.4.27"
2323
pyperscan = "^0.3.0"
2424
lark = "^1.1.8"
2525
lz4 = "^4.3.2"
26-
lief = "^0.15.1"
27-
cryptography = ">=41.0,<44.0"
26+
lief = "^0.16.1"
27+
cryptography = ">=41.0"
2828
treelib = "^1.7.0"
2929
unblob-native = "^0.1.5"
3030
jefferson = "^0.4.5"

unblob/handlers/executable/elf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def is_valid_header(self, header) -> bool:
143143
lief.ELF.Header.FILE_TYPE(header.e_type)
144144
lief.ELF.ARCH(header.e_machine)
145145
lief.ELF.Header.VERSION(header.e_version)
146-
except RuntimeError:
146+
except ValueError:
147147
return False
148148
return True
149149

@@ -170,7 +170,7 @@ def get_last_section_end(
170170
== lief.ELF.Section.TYPE.NOBITS
171171
):
172172
continue
173-
except RuntimeError:
173+
except ValueError:
174174
continue
175175

176176
section_end = section_header.sh_offset + section_header.sh_size

0 commit comments

Comments
 (0)