• Heikki Linnakangas's avatar
    Tidy up GetMultiXactIdMembers()'s behavior on error · d24c5658
    Heikki Linnakangas authored
    One of the error paths left *members uninitialized. That's not a live
    bug, because most callers don't look at *members when the function
    returns -1, but let's be tidy. One caller, in heap_lock_tuple(), does
    "if (members != NULL) pfree(members)", but AFAICS it never passes an
    invalid 'multi' value so it should not reach that error case.
    
    The callers are also a bit inconsistent in their expectations.
    heap_lock_tuple() pfrees the 'members' array if it's not-NULL, others
    pfree() it if "nmembers >= 0", and others if "nmembers > 0". That's
    not a live bug either, because the function should never return 0, but
    add an Assert for that to make it more clear. I left the callers alone
    for now.
    
    I also moved the line where we set *nmembers. It wasn't wrong before,
    but I like to do that right next to the 'return' statement, to make it
    clear that it's always set on return.
    
    Also remove one unreachable return statement after ereport(ERROR), for
    brevity and for consistency with the similar if-block right after it.
    
    Author: Greg Nancarrow with the additional changes by me
    Backpatch-through: 9.6, all supported versions
    d24c5658
multixact.c 111 KB