Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
fe64960a
Commit
fe64960a
authored
Mar 02, 2016
by
antirez
Browse files
More BITFIELD fixes. Overflow conditional simplified.
See issue #3114.
parent
235f5534
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/bitops.c
View file @
fe64960a
...
@@ -203,7 +203,7 @@ void setUnsignedBitfield(unsigned char *p, uint64_t offset, uint64_t bits, uint6
...
@@ -203,7 +203,7 @@ void setUnsignedBitfield(unsigned char *p, uint64_t offset, uint64_t bits, uint6
uint64_t
byte
,
bit
,
byteval
,
bitval
,
j
;
uint64_t
byte
,
bit
,
byteval
,
bitval
,
j
;
for
(
j
=
0
;
j
<
bits
;
j
++
)
{
for
(
j
=
0
;
j
<
bits
;
j
++
)
{
bitval
=
(
value
&
(
1
<<
(
bits
-
1
-
j
)))
!=
0
;
bitval
=
(
value
&
(
(
uint64_t
)
1
<<
(
bits
-
1
-
j
)))
!=
0
;
byte
=
offset
>>
3
;
byte
=
offset
>>
3
;
bit
=
7
-
(
offset
&
0x7
);
bit
=
7
-
(
offset
&
0x7
);
byteval
=
p
[
byte
];
byteval
=
p
[
byte
];
...
@@ -243,7 +243,7 @@ int64_t getSignedBitfield(unsigned char *p, uint64_t offset, uint64_t bits) {
...
@@ -243,7 +243,7 @@ int64_t getSignedBitfield(unsigned char *p, uint64_t offset, uint64_t bits) {
/* If the top significant bit is 1, propagate it to all the
/* If the top significant bit is 1, propagate it to all the
* higher bits for two complement representation of signed
* higher bits for two complement representation of signed
* integers. */
* integers. */
if
(
value
&
(
1
<<
(
bits
-
1
)))
if
(
value
&
(
(
uint64_t
)
1
<<
(
bits
-
1
)))
value
|=
((
uint64_t
)
-
1
)
<<
bits
;
value
|=
((
uint64_t
)
-
1
)
<<
bits
;
return
value
;
return
value
;
}
}
...
@@ -272,7 +272,7 @@ int64_t getSignedBitfield(unsigned char *p, uint64_t offset, uint64_t bits) {
...
@@ -272,7 +272,7 @@ int64_t getSignedBitfield(unsigned char *p, uint64_t offset, uint64_t bits) {
#define BFOVERFLOW_FAIL 2
/* Used by the BITFIELD command implementation. */
#define BFOVERFLOW_FAIL 2
/* Used by the BITFIELD command implementation. */
int
checkUnsignedBitfieldOverflow
(
uint64_t
value
,
int64_t
incr
,
uint64_t
bits
,
int
owtype
,
uint64_t
*
limit
)
{
int
checkUnsignedBitfieldOverflow
(
uint64_t
value
,
int64_t
incr
,
uint64_t
bits
,
int
owtype
,
uint64_t
*
limit
)
{
uint64_t
max
=
(
bits
==
64
)
?
UINT64_MAX
:
((
1
<<
bits
)
-
1
);
uint64_t
max
=
(
bits
==
64
)
?
UINT64_MAX
:
((
(
uint64_t
)
1
<<
bits
)
-
1
);
int64_t
maxincr
=
max
-
value
;
int64_t
maxincr
=
max
-
value
;
int64_t
minincr
=
-
value
;
int64_t
minincr
=
-
value
;
...
@@ -309,7 +309,7 @@ handle_wrap:
...
@@ -309,7 +309,7 @@ handle_wrap:
}
}
int
checkSignedBitfieldOverflow
(
int64_t
value
,
int64_t
incr
,
uint64_t
bits
,
int
owtype
,
int64_t
*
limit
)
{
int
checkSignedBitfieldOverflow
(
int64_t
value
,
int64_t
incr
,
uint64_t
bits
,
int
owtype
,
int64_t
*
limit
)
{
int64_t
max
=
(
bits
==
64
)
?
INT64_MAX
:
((
1
<<
(
bits
-
1
))
-
1
);
int64_t
max
=
(
bits
==
64
)
?
INT64_MAX
:
((
(
int64_t
)
1
<<
(
bits
-
1
))
-
1
);
int64_t
min
=
(
-
max
)
-
1
;
int64_t
min
=
(
-
max
)
-
1
;
/* Note that maxincr and minincr could overflow, but we use the values
/* Note that maxincr and minincr could overflow, but we use the values
...
@@ -318,8 +318,8 @@ int checkSignedBitfieldOverflow(int64_t value, int64_t incr, uint64_t bits, int
...
@@ -318,8 +318,8 @@ int checkSignedBitfieldOverflow(int64_t value, int64_t incr, uint64_t bits, int
int64_t
maxincr
=
max
-
value
;
int64_t
maxincr
=
max
-
value
;
int64_t
minincr
=
min
-
value
;
int64_t
minincr
=
min
-
value
;
if
(
value
>
max
||
(
bits
=
=
64
&&
value
>=
0
&&
incr
>
0
&&
incr
>
maxincr
)
if
(
value
>
max
||
(
bits
!
=
64
&&
incr
>
maxincr
)
||
(
value
>=
0
&&
incr
>
0
&&
incr
>
maxincr
)
)
||
(
bits
<
64
&&
incr
>
0
&&
incr
>
maxincr
))
{
{
if
(
limit
)
{
if
(
limit
)
{
if
(
owtype
==
BFOVERFLOW_WRAP
)
{
if
(
owtype
==
BFOVERFLOW_WRAP
)
{
goto
handle_wrap
;
goto
handle_wrap
;
...
@@ -328,8 +328,7 @@ int checkSignedBitfieldOverflow(int64_t value, int64_t incr, uint64_t bits, int
...
@@ -328,8 +328,7 @@ int checkSignedBitfieldOverflow(int64_t value, int64_t incr, uint64_t bits, int
}
}
}
}
return
1
;
return
1
;
}
else
if
(
value
<
min
||
(
bits
==
64
&&
value
<
0
&&
incr
<
0
&&
incr
<
minincr
)
}
else
if
(
value
<
min
||
(
bits
!=
64
&&
incr
<
minincr
)
||
(
value
<
0
&&
incr
<
0
&&
incr
<
minincr
))
{
||
(
bits
<
64
&&
incr
<
0
&&
incr
<
minincr
))
{
if
(
limit
)
{
if
(
limit
)
{
if
(
owtype
==
BFOVERFLOW_WRAP
)
{
if
(
owtype
==
BFOVERFLOW_WRAP
)
{
goto
handle_wrap
;
goto
handle_wrap
;
...
@@ -966,7 +965,7 @@ void bitfieldCommand(client *c) {
...
@@ -966,7 +965,7 @@ void bitfieldCommand(client *c) {
* we need fetch & store as well. */
* we need fetch & store as well. */
if
((
o
=
lookupStringForBitCommand
(
c
,
thisop
->
offset
+
thisop
->
bits
))
if
((
o
=
lookupStringForBitCommand
(
c
,
thisop
->
offset
+
thisop
->
bits
))
==
NULL
)
return
;
==
NULL
)
return
;
/* We need two different but very similar code paths for signed
/* We need two different but very similar code paths for signed
* and unsigned operations, since the set of functions to get/set
* and unsigned operations, since the set of functions to get/set
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment