X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-terminal%2Fgrdev.c;h=fa1fc378c807337e03650f8a7b8e7108acb9f288;hb=c5e6bfc6bc46dd8bc187e035929d6a49cd23ec09;hp=c5ea524c69fd725990977f9e55bb4856527c4981;hpb=0508a4dfb8300000fcfc5fa5147582e5feebf1a8;p=elogind.git diff --git a/src/libsystemd-terminal/grdev.c b/src/libsystemd-terminal/grdev.c index c5ea524c6..fa1fc378c 100644 --- a/src/libsystemd-terminal/grdev.c +++ b/src/libsystemd-terminal/grdev.c @@ -158,6 +158,7 @@ int grdev_tile_new_leaf(grdev_tile **out, grdev_pipe *pipe) { _cleanup_(grdev_tile_freep) grdev_tile *tile = NULL; int r; + assert_return(out, -EINVAL); assert_return(pipe, -EINVAL); assert_return(!pipe->tile, -EINVAL); @@ -345,7 +346,7 @@ const grdev_display_target *grdev_display_next_target(grdev_display *display, co assert(cache->pipe->tile->display == display); assert(display->pipes >= cache); - idx = (cache - display->pipes) / sizeof(*cache) + 1; + idx = cache - display->pipes + 1; } else { idx = 0; }