Skip to content

Fix some invalid decoded lengths from various type decoding methods #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0neblock wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix some invalid decoded lengths from various type decoding methods #49

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
6 changes: 3 additions & 3 deletions src/BERDecode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ int OIDType::fromBuffer(const uint8_t *buf, size_t max_len){
this->data.assign(dataPtr, dataPtr + _length);
this->valid = true;

return _length + 2;
return _length + j;
}

static inline void long_to_buf(char* buf, long l, short r = 0){
Expand Down Expand Up @@ -208,7 +208,7 @@ int Counter64::fromBuffer(const uint8_t *buf, size_t max_len){
_value = _value | *ptr++;
tempLength--;
}
return _length + 2;
return _length + i;
}

std::shared_ptr<BER_CONTAINER> ComplexType::createObjectForType(ASN_TYPE valueType){
Expand Down Expand Up @@ -290,5 +290,5 @@ int ComplexType::fromBuffer(const uint8_t *buf, size_t max_len){
ptr += used_length;
i += used_length;
}
return _length + 2;
return _length + j;
}