gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Non-conflicting account duplicate marker value (#8206)

Browse Source
This commit is contained in:
Jack May
2020-02-11 10:03:28 -08:00
committed by GitHub
parent 890919d140
commit 517fe73734
5 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sdk/bpf/c/inc/solana_sdk.h
View File

@ -46,6 +46,30 @@ static_assert(sizeof(int64_t) == 8);
static_assert(sizeof(uint64_t) == 8);
#endif
/**
* Minimum of signed integral types
*/
# define INT8_MIN (-128)
# define INT16_MIN (-32767-1)
# define INT32_MIN (-2147483647-1)
# define INT64_MIN (-__INT64_C(9223372036854775807)-1)
/**
* Maximum of signed integral types
*/
# define INT8_MAX (127)
# define INT16_MAX (32767)
# define INT32_MAX (2147483647)
# define INT64_MAX (__INT64_C(9223372036854775807))
/**
* Maximum of unsigned integral types
*/
# define UINT8_MAX (255)
# define UINT16_MAX (65535)
# define UINT32_MAX (4294967295U)
# define UINT64_MAX (__UINT64_C(18446744073709551615))
/**
* NULL
*/
@ -265,7 +289,7 @@ SOL_FN_PREFIX bool sol_deserialize(
for (int i = 0; i < params->ka_num; i++) {
uint8_t dup_info = input[0];
input += sizeof(uint8_t);
if (dup_info == 0) {
if (dup_info == UINT8_MAX) {
// is signer?
params->ka[i].is_signer = *(uint8_t *) input != 0;
input += sizeof(uint8_t);

6
sdk/src/entrypoint.rs
View File

@ -64,9 +64,9 @@ pub unsafe fn deserialize<'a>(input: *mut u8) -> (&'a Pubkey, Vec<AccountInfo<'a
let mut accounts = Vec::with_capacity(num_accounts);
for _ in 0..num_accounts {
let dup_info = *(input.add(offset) as *const u8) as usize;
let dup_info = *(input.add(offset) as *const u8);
offset += size_of::<u8>();
if dup_info == 0 {
if dup_info == std::u8::MAX {
let is_signer = {
#[allow(clippy::cast_ptr_alignment)]
let is_signer = *(input.add(offset) as *const u8);
@ -110,7 +110,7 @@ pub unsafe fn deserialize<'a>(input: *mut u8) -> (&'a Pubkey, Vec<AccountInfo<'a
});
} else {
// Duplicate account, clone the original
accounts.push(accounts[dup_info].clone());
accounts.push(accounts[dup_info as usize].clone());
}
}