mirrors/valkey
1
0
Fork 0
mirror of http://github.com/valkey-io/valkey synced 2024-11-23 11:51:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

access to already freed job structure fixed by statements reoredering

Browse Source
This commit is contained in:
antirez 2010-01-13 16:26:41 -05:00
parent 85a2775298
commit 427a2153d3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
redis.c
View File

@ -7579,6 +7579,12 @@ static void vmCancelThreadedIOJob(robj *o) {
if (compareStringObjects(job->key,o) == 0) { if (compareStringObjects(job->key,o) == 0) {
redisLog(REDIS_DEBUG,"*** CANCELED %p (%s)\n", redisLog(REDIS_DEBUG,"*** CANCELED %p (%s)\n",
(void*)job, (char*)o->ptr); (void*)job, (char*)o->ptr);
/* Mark the pages as free since the swap didn't happened
* or happened but is now discarded. */
if (job->type == REDIS_IOJOB_DO_SWAP)
vmMarkPagesFree(job->page,job->pages);
/* Cancel the job. It depends on the list the job is
* living in. */
switch(i) { switch(i) {
case 0: /* io_newjobs */ case 0: /* io_newjobs */
/* If the job was yet not processed the best thing to do /* If the job was yet not processed the best thing to do
@ -7591,10 +7597,6 @@ static void vmCancelThreadedIOJob(robj *o) {
job->canceled = 1; job->canceled = 1;
break; break;
} }
/* Mark the pages as free since the swap didn't happened
* or happened but is not discarded. */
if (job->type == REDIS_IOJOB_DO_SWAP)
vmMarkPagesFree(job->page,job->pages);
/* Finally we have to adjust the storage type of the object /* Finally we have to adjust the storage type of the object
* in order to "UNDO" the operaiton. */ * in order to "UNDO" the operaiton. */
if (o->storage == REDIS_VM_LOADING) if (o->storage == REDIS_VM_LOADING)