cursor: handle NULL readers gracefully

Fixes #55
This commit is contained in:
Christian Hergert
2021-02-23 15:30:12 -08:00
parent f41212680a
commit 843585e00d
2 changed files with 24 additions and 9 deletions

View File

@ -151,9 +151,11 @@ sysprof_capture_cursor_foreach (SysprofCaptureCursor *self,
void *user_data)
{
assert (self != NULL);
assert (self->reader != NULL);
assert (callback != NULL);
if (self->reader == NULL)
return;
for (;;)
{
const SysprofCaptureFrame *frame;
@ -260,9 +262,9 @@ void
sysprof_capture_cursor_reset (SysprofCaptureCursor *self)
{
assert (self != NULL);
assert (self->reader != NULL);
sysprof_capture_reader_reset (self->reader);
if (self->reader != NULL)
sysprof_capture_reader_reset (self->reader);
}
void
@ -305,18 +307,20 @@ sysprof_capture_cursor_add_condition (SysprofCaptureCursor *self,
* sysprof_capture_cursor_new:
* @self: a #SysprofCaptureCursor
*
* Returns: (transfer full): a new cursor for @reader
* Returns: (transfer full) (nullable): a new cursor for @reader
*/
SysprofCaptureCursor *
sysprof_capture_cursor_new (SysprofCaptureReader *reader)
{
SysprofCaptureCursor *self;
assert (reader != NULL);
self = sysprof_capture_cursor_init ();
self->reader = sysprof_capture_reader_copy (reader);
sysprof_capture_reader_reset (self->reader);
if (reader != NULL)
{
self->reader = sysprof_capture_reader_copy (reader);
sysprof_capture_reader_reset (self->reader);
}
return self;
}
@ -326,7 +330,7 @@ sysprof_capture_cursor_new (SysprofCaptureReader *reader)
*
* Gets the underlying reader that is used by the cursor.
*
* Returns: (transfer none): An #SysprofCaptureReader
* Returns: (transfer none) (nullable): An #SysprofCaptureReader
*/
SysprofCaptureReader *
sysprof_capture_cursor_get_reader (SysprofCaptureCursor *self)