d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Limit RESOLUTION_MAX to INT_MAX, not UINT_MAX (all spelled out) so the

Browse Source 
mode value isn't always clipped to -1 when (resolution * size) == 32, which
would have been the case with values => {4i,32b,32t}.

This seems to have been broken in r64382.

MFC after: 1 week
X-MFC with: r289915
PR: 200619
Reported by: Michael Baptist
Submitted by: Lars Skodje
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
ngie 2015-10-25 04:37:00 +00:00
parent c3b2fc1a17
commit 6cbc0a2725
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/camcontrol/modeedit.c
View File

@ -246,7 +246,7 @@ editentry_set(char *name, char *newvalue, int editonly)
* currently workaround it (even for int64's), so we have to kludge it. * currently workaround it (even for int64's), so we have to kludge it.
*/ */
#define RESOLUTION_MAX(size) ((resolution * (size) == 32)? \ #define RESOLUTION_MAX(size) ((resolution * (size) == 32)? \
(int)0xffffffff: (1 << (resolution * (size))) - 1) INT_MAX: (1 << (resolution * (size))) - 1)
assert(newvalue != NULL); assert(newvalue != NULL);
if (*newvalue == '\0') if (*newvalue == '\0')