sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

pidl/python: Calculate maximum integer values using a lookup table

Browse Source 
This avoids a << of 64 bits in the unused end of the conditional expression.

This was flagged by Coverity and the fix was suggested by metze.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11429

Andrew Bartlett

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit c2f4e324d9c1ced2e1da859594ef67ae9f645919)
This commit is contained in:
Andrew Bartlett 2015-08-28 11:46:56 +12:00 committed by Stefan Metzmacher
parent d2f2df6847
commit bd44d03159
1 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pidl/lib/Parse/Pidl/Samba4/Python.pm
View File

@ -974,7 +974,7 @@ sub ConvertObjectFromPythonData($$$$$$;$)
|uid_t|gid_t)$/x) {
$self->pidl("{");
$self->indent;
$self->pidl("const unsigned long long uint_max = (sizeof($target) == 8) ? UINT64_MAX : (unsigned long long)((1ULL << (sizeof($target) * 8)) - 1);");
$self->pidl("const unsigned long long uint_max = ndr_sizeof2uintmax(sizeof($target));");
$self->pidl("if (PyLong_Check($cvar)) {");
$self->indent;
$self->pidl("unsigned long long test_var;");
@ -1025,7 +1025,7 @@ sub ConvertObjectFromPythonData($$$$$$;$)
if ($ctype_alias =~ /^(dlong|char|int[0-9]*|time_t)$/x) {
$self->pidl("{");
$self->indent;
$self->pidl("const long long int_max = (long long)((1ULL << (sizeof($target) * 8 - 1)) - 1);");
$self->pidl("const long long int_max = ndr_sizeof2intmax(sizeof($target));");
$self->pidl("const long long int_min = -int_max - 1;");
$self->pidl("if (PyLong_Check($cvar)) {");
$self->indent;
@ -1498,6 +1498,43 @@ sub Parse($$$$$)
#include \"$hdr\"
#include \"$ndr_hdr\"
/*
* These functions are here to ensure they can be optomised out by
* the compiler based on the constant input values
*/
static inline unsigned long long ndr_sizeof2uintmax(size_t var_size)
{
switch (var_size) {
case 8:
return UINT64_MAX;
case 4:
return UINT32_MAX;
case 2:
return UINT16_MAX;
case 1:
return UINT8_MAX;
}
return 0;
}
static inline long long ndr_sizeof2intmax(size_t var_size)
{
switch (var_size) {
case 8:
return INT64_MAX;
case 4:
return INT32_MAX;
case 2:
return INT16_MAX;
case 1:
return INT8_MAX;
}
return 0;
}
");
foreach my $x (@$ndr) {