Fix regression caused by a6b2442e

File regressed is https://bugs.freedesktop.org/attachment.cgi?id=118361

The old code did different things in nullptr compared to empty buffer so we need to have the same semantics, use an optional for that