FWIW, that looks fine to me. I don't know how I managed to miss that. Sorry about that ☹
That "fix" was not cc:ed to any of the wifi developers and would need a lot of review before I feel comfortable accepting it, as I said in the response to that message.
Indeed, I hadn't seen it before.
But I just checked the error paths there, and the fix adjust all three of them correctly.
johannes