Skip to content

serialize the pdu - long type is 8 bytes on 64 bits machine - fix to … #1235

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
Maayan311 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

serialize the pdu - long type is 8 bytes on 64 bits machine - fix to … #1235

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bb273c
serialize the pdu - long type is 8 bytes on 64 bits machine - fix to …
Maayan311 Sep 3, 2020
fc20a30
Merge branch 'master' into snmp_trap_branch
jwillemsen Feb 1, 2025
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
12 changes: 6 additions & 6 deletions ACE/ASNMP/asnmp/asn1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,10 @@ u_char * asn1::build_int( u_char *data,
* ASN.1 integer ::= 0x02 asnlength byte {byte}*
*/

long integer;
u_long mask;
int integer;
u_int mask;

if (intsize != (int) sizeof (long))
if (intsize < (int) sizeof (integer))
return 0;
integer = *intp;
/*
Expand All @@ -187,7 +187,7 @@ u_char * asn1::build_int( u_char *data,
* consecutive 1's or 0's at the most significant end of the
* integer.
*/
mask = u_long (0x1FF) << ((8 * (sizeof(u_long) - 1)) - 1);
mask = u_int (0x1FF) << ((8 * (sizeof(mask) - 1)) - 1);
/* mask is 0xFF800000 on a big-endian machine */
while((((integer & mask) == 0) || ((integer & mask) == mask))
&& intsize > 1){
Expand All @@ -200,10 +200,10 @@ u_char * asn1::build_int( u_char *data,
if (*datalength < intsize)
return 0;
*datalength -= intsize;
mask = u_long (0xFF) << (8 * (sizeof(u_long) - 1));
mask = u_int (0xFF) << (8 * (sizeof(mask) - 1));
/* mask is 0xFF000000 on a big-endian machine */
while(intsize--){
*data++ = (u_char)((integer & mask) >> (8 * (sizeof(long) - 1)));
*data++ = (u_char)((integer & mask) >> (8 * (sizeof(integer) - 1)));
integer <<= 8;
}
return data;
Expand Down