Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Align C and Rust handling of AccountInfos #8906

Merged
merged 1 commit into from
Mar 17, 2020
Merged

Align C and Rust handling of AccountInfos #8906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion programs/bpf/c/src/error_handling/error_handling.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

extern uint64_t entrypoint(const uint8_t *input) {
SolKeyedAccount ka[4];
SolKeyedAccount ka[1];
SolParameters params = (SolParameters) { .ka = ka };

if (!sol_deserialize(input, &params, SOL_ARRAY_SIZE(ka))) {
Expand Down
19 changes: 17 additions & 2 deletions sdk/bpf/c/inc/solana_sdk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,13 +284,29 @@ SOL_FN_PREFIX bool sol_deserialize(
}
params->ka_num = *(uint64_t *) input;
input += sizeof(uint64_t);
if (ka_num < params->ka_num) {

if (ka_num > params->ka_num) {
return false;
}

for (int i = 0; i < params->ka_num; i++) {
uint8_t dup_info = input[0];
input += sizeof(uint8_t);

if (i >= ka_num) {
if (dup_info == UINT8_MAX) {
input += sizeof(uint8_t);
input += sizeof(uint8_t);
input += sizeof(SolPubkey);
input += sizeof(uint64_t);
input += *(uint64_t *) input;
input += sizeof(uint64_t);
input += sizeof(SolPubkey);
input += sizeof(uint8_t);
input += sizeof(uint64_t);
}
continue;
}
if (dup_info == UINT8_MAX) {
// is signer?
params->ka[i].is_signer = *(uint8_t *) input != 0;
Expand Down Expand Up @@ -418,7 +434,6 @@ SOL_FN_PREFIX void sol_log_params(const SolParameters *params) {
*/
uint64_t entrypoint(const uint8_t *input);


#ifdef SOL_TEST
/**
* Stub log functions when building tests
Expand Down