The patch uses the "LENGTH_VAR != 0" style in px.c, but it uses "POINTER_VAR != NULL" style in the other files. Please use "LENGTH_VAR != 0" style in each place you're changing.
Assuming the next version looks good, I'll likely back-patch it to v10. Would anyone like to argue for a back-patch all the way to 9.2?