Amebis/GEANTLink
Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

Strings packed/unpacked as zero-terminated (instead of length prefixed) now

Browse Source
This commit is contained in:
Simon Rozman 2016-07-20 09:22:54 +02:00
parent 54fc2dd830
commit 504ea681a9
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/EAPBase/include/EAPSerial.h
View File

@ -351,10 +351,8 @@ namespace eapserial
inline void pack(_Inout_ unsigned char *&cursor, _In_ const std::basic_string<_Elem, _Traits, _Ax> &val) inline void pack(_Inout_ unsigned char *&cursor, _In_ const std::basic_string<_Elem, _Traits, _Ax> &val)
{ {
std::basic_string<_Elem, _Traits, _Ax>::size_type count = val.length(); std::basic_string<_Elem, _Traits, _Ax>::size_type count = val.length();
*(std::basic_string<_Elem, _Traits, _Ax>::size_type*&)cursor = count; assert(strlen(val.c_str()) == count); // String should not contain null characters
cursor += sizeof(std::basic_string<_Elem, _Traits, _Ax>::size_type); size_t nSize = sizeof(_Elem)*(count + 1);
size_t nSize = sizeof(_Elem)*count;
memcpy(cursor, (const _Elem*)val.c_str(), nSize); memcpy(cursor, (const _Elem*)val.c_str(), nSize);
cursor += nSize; cursor += nSize;
} }
@ -363,18 +361,16 @@ namespace eapserial
template<class _Elem, class _Traits, class _Ax> template<class _Elem, class _Traits, class _Ax>
inline size_t get_pk_size(const std::basic_string<_Elem, _Traits, _Ax> &val) inline size_t get_pk_size(const std::basic_string<_Elem, _Traits, _Ax> &val)
{ {
return sizeof(std::basic_string<_Elem, _Traits, _Ax>::size_type) + sizeof(_Elem)*val.length(); return sizeof(_Elem)*(val.length() + 1);
} }
template<class _Elem, class _Traits, class _Ax> template<class _Elem, class _Traits, class _Ax>
inline void unpack(_Inout_ const unsigned char *&cursor, _Out_ std::basic_string<_Elem, _Traits, _Ax> &val) inline void unpack(_Inout_ const unsigned char *&cursor, _Out_ std::basic_string<_Elem, _Traits, _Ax> &val)
{ {
std::basic_string<_Elem, _Traits, _Ax>::size_type count = *(const std::basic_string<_Elem, _Traits, _Ax>::size_type*&)cursor; std::basic_string<_Elem, _Traits, _Ax>::size_type count = strlen((const _Elem*&)cursor);
cursor += sizeof(std::basic_string<_Elem, _Traits, _Ax>::size_type);
val.assign((const _Elem*&)cursor, count); val.assign((const _Elem*&)cursor, count);
cursor += sizeof(_Elem)*count; cursor += sizeof(_Elem)*(count + 1);
} }