RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 01:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid sign-extension of non-magic Message* values

Browse Source 
Cast to (unsigned long) when checking for magic values, so
real ptrs don't get sign-extended.  Avoids triggering
assert(inq == &local_queue) failure.

Fixes: #3251
Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Sage Weil <sage.weil@inktank.com>
This commit is contained in:
Dan Mick 2012-10-02 15:37:42 -07:00
parent 035cf96501
commit 67a201d64b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/msg/DispatchQueue.cc
View File

@ -211,7 +211,7 @@ void DispatchQueue::entry()
}
Connection *con = NULL;
if ((long)m < DispatchQueue::D_NUM_CODES) {
if ((unsigned long)m < DispatchQueue::D_NUM_CODES) {
assert(inq == &local_queue);
con = con_q.front();
con_q.pop_front();
@ -226,16 +226,16 @@ void DispatchQueue::entry()
if (dequeued)
inq->put();
if ((long)m == DispatchQueue::D_BAD_REMOTE_RESET) {
if ((unsigned long)m == DispatchQueue::D_BAD_REMOTE_RESET) {
msgr->ms_deliver_handle_remote_reset(con);
con->put();
} else if ((long)m == DispatchQueue::D_CONNECT) {
} else if ((unsigned long)m == DispatchQueue::D_CONNECT) {
msgr->ms_deliver_handle_connect(con);
con->put();
} else if ((long)m == DispatchQueue::D_ACCEPT) {
} else if ((unsigned long)m == DispatchQueue::D_ACCEPT) {
msgr->ms_deliver_handle_accept(con);
con->put();
} else if ((long)m == DispatchQueue::D_BAD_RESET) {
} else if ((unsigned long)m == DispatchQueue::D_BAD_RESET) {
msgr->ms_deliver_handle_reset(con);
con->put();
} else {