Merge pull request #105 from usefulcat/master

vasi · web-flow · commit 8155addb464d · 2023-09-13T17:45:17.000-04:00
Bug fix for segfault
diff --git a/src/common.c b/src/common.c
@@ -388,13 +388,13 @@ void queue_free(queue_t *q) {
 }
 
 void queue_push(queue_t *q, int type, void *data) {
-    pthread_mutex_lock(&q->mutex);
-    
     queue_item_t *i = malloc(sizeof(queue_item_t));
     i->type = type;
     i->data = data;
     i->next = NULL;
     
+    pthread_mutex_lock(&q->mutex);
+    
     if (q->last) {
         q->last->next = i;
     } else {
@@ -415,12 +415,12 @@ int queue_pop(queue_t *q, void **datap) {
     q->first = i->next;
     if (!q->first)
         q->last = NULL;
+    pthread_mutex_unlock(&q->mutex);
     
     *datap = i->data;
     int type = i->type;
     free(i);
     
-    pthread_mutex_unlock(&q->mutex);
     return type;
 }
 
diff --git a/src/read.c b/src/read.c
@@ -536,7 +536,7 @@ static void read_thread(void) {
                 debug("read: skip %llu", iter.block.number_in_file);
                 continue;
             }
-            for ( ; w && w->end < uend; w = w->next) ;
+            for ( ; w && w->end <= uend; w = w->next) ;
         }
         debug("read: want %llu", iter.block.number_in_file);
         

Original file line number	Diff line number	Diff line change
`@@ -536,7 +536,7 @@ static void read_thread(void) {`
`536`	`536`	`debug("read: skip %llu", iter.block.number_in_file);`
`537`	`537`	`continue;`
`538`	`538`	`}`
`539`		`- for ( ; w && w->end < uend; w = w->next) ;`
	`539`	`+ for ( ; w && w->end <= uend; w = w->next) ;`
`540`	`540`	`}`
`541`	`541`	`debug("read: want %llu", iter.block.number_in_file);`
`542`	`542`