代码文件:archive_read_support_format_mtree.rs
问题代码函数:parse_digest
未使用已经写好的结构体
重构前
switch (type) {
case ARCHIVE_ENTRY_DIGEST_MD5:
len = sizeof(entry->digest.md5);
break;
case ARCHIVE_ENTRY_DIGEST_RMD160:
len = sizeof(entry->digest.rmd160);
break;
case ARCHIVE_ENTRY_DIGEST_SHA1:
len = sizeof(entry->digest.sha1);
break;
case ARCHIVE_ENTRY_DIGEST_SHA256:
len = sizeof(entry->digest.sha256);
break;
case ARCHIVE_ENTRY_DIGEST_SHA384:
len = sizeof(entry->digest.sha384);
break;
case ARCHIVE_ENTRY_DIGEST_SHA512:
len = sizeof(entry->digest.sha512);
break;
重构后
match type_0 {
1 => len = size_of::<[u8; 16]>() as u64,
2 => len = size_of::<[u8; 20]>() as u64,
3 => len = size_of::<[u8; 20]>() as u64,
4 => len = size_of::<[u8; 32]>() as u64,
5 => len = size_of::<[u8; 48]>() as u64,
6 => len = size_of::<[u8; 64]>() as u64,
_ => {
archive_set_error_safe!(
&mut a_safe.archive as *mut archive,
ARCHIVE_MTREE_DEFINED_PARAM.archive_errno_programmer,
b"Internal error: Unknown digest type\x00" as *const u8
);
return ARCHIVE_MTREE_DEFINED_PARAM.archive_fatal;
}
}
重构后的len中没有使用entry->digest.sha256类似方式取值,而是重新定义了一遍,结构体archive_entry、ae_digest均已重构,建议使用重构前的方式实现;原代码中的定义的宏均未体现,难以理解123456所代表的含义
Hi han_hui_hui, welcome to the openEuler Community.
I'm the Bot here serving you. You can find the instructions on how to interact with me at Here.
If you have any questions, please contact the SIG: Base-service, and any of the maintainers: @hexiaowen , @zhujianwei001 , @谢志鹏 , @Monday , @Sora5175 , @Kevin , @lcynju , @huangduirong
此处可能存在不合适展示的内容,页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容,可点击提交进行申诉,我们将尽快为您处理。
类似这种情况很多,建议C代码中涉及到struct的都仔细排查下。。
例如archive_read_support_format_lha.rs中的archive_read_format_lha_read_header函数
重构前
struct archive_wstring linkname;
struct archive_wstring pathname;
struct lha *lha;
const unsigned char *p;
const char *signature;
int err;
struct archive_mstring conv_buffer;
const wchar_t *conv_buffer_p;
重构后
let mut linkname: archive_wstring = archive_wstring {
s: 0 as *mut wchar_t,
length: 0,
buffer_length: 0,
};
let mut pathname: archive_wstring = archive_wstring {
s: 0 as *mut wchar_t,
length: 0,
buffer_length: 0,
};
let safe_a = unsafe { &mut *a };
let mut p: *const u8 = 0 as *const u8;
let mut signature: *const u8 = 0 as *const u8;
let mut err: i32 = 0;
let mut conv_buffer: archive_mstring = archive_mstring {
aes_mbs: archive_string {
s: 0 as *mut u8,
length: 0,
buffer_length: 0,
},
aes_utf8: archive_string {
s: 0 as *mut u8,
length: 0,
buffer_length: 0,
},
aes_wcs: archive_wstring {
s: 0 as *mut wchar_t,
length: 0,
buffer_length: 0,
},
aes_mbs_in_locale: archive_string {
s: 0 as *mut u8,
length: 0,
buffer_length: 0,
},
aes_set: 0,
};
此处为漏改的部分,新提交的pr已解决:!93:解决部分Issue提到的问题:解决部分Issue提到的问题:解决部分Issue提到的问题
登录 后才可以发表评论