CDRIVER-1046: Free BSON reader before new assignment

jmikola · bjori · commit 4039c286539f · 2015-12-09T15:52:07.000-08:00
diff --git a/src/mongoc/mongoc-cursor.c b/src/mongoc/mongoc-cursor.c
@@ -468,7 +468,7 @@ _mongoc_cursor_op_query (mongoc_cursor_t        *cursor,
    }
 
    if (cursor->reader) {
-      bson_reader_destroy(cursor->reader);
+      bson_reader_destroy (cursor->reader);
    }
 
    cursor->reader = bson_reader_new_from_data(
@@ -554,6 +554,10 @@ _mongoc_cursor_run_command (mongoc_cursor_t *cursor,
       GOTO (done);
    }
 
+   if (cursor->reader) {
+      bson_reader_destroy (cursor->reader);
+   }
+
    cursor->reader = bson_reader_new_from_data (
       cursor->rpc.reply.documents,
       (size_t)cursor->rpc.reply.documents_len);

Original file line number	Diff line number	Diff line change
`@@ -468,7 +468,7 @@ _mongoc_cursor_op_query (mongoc_cursor_t *cursor,`
`468`	`468`	`}`
`469`	`469`
`470`	`470`	`if (cursor->reader) {`
`471`		`- bson_reader_destroy(cursor->reader);`
	`471`	`+ bson_reader_destroy (cursor->reader);`
`472`	`472`	`}`
`473`	`473`
`474`	`474`	`cursor->reader = bson_reader_new_from_data(`
`@@ -554,6 +554,10 @@ _mongoc_cursor_run_command (mongoc_cursor_t *cursor,`
`554`	`554`	`GOTO (done);`
`555`	`555`	`}`
`556`	`556`
	`557`	`+ if (cursor->reader) {`
	`558`	`+ bson_reader_destroy (cursor->reader);`
	`559`	`+ }`
	`560`	`+`
`557`	`561`	`cursor->reader = bson_reader_new_from_data (`
`558`	`562`	`cursor->rpc.reply.documents,`
`559`	`563`	`(size_t)cursor->rpc.reply.documents_len);`