Re: [HACKERS] Open 6.4 items

Bruce Momjian <maillist(at)candle(dot)pha(dot)pa(dot)us> writes:

> I have lost it. Could someone resend it, and the patch to reverse too.

This is the one that shouldn't have been applied:

Index: inet_net_pton.c
===================================================================
RCS file: /usr/local/cvsroot/pgsql/src/backend/utils/adt/inet_net_pton.c,v
retrieving revision 1.2
diff -r1.2 inet_net_pton.c
120c120
< else if (size-- > 0)
---
> else if (--size > 0)

This is the one that works:

Index: inet_net_pton.c
===================================================================
RCS file: /usr/local/cvsroot/pgsql/src/backend/utils/adt/inet_net_pton.c,v
retrieving revision 1.2
diff -r1.2 inet_net_pton.c
108c108,109
< *dst = 0, dirty = 0;
---
> tmp = 0;
> dirty = 0;
117,122c118,127
< *dst |= n;
< if (!dirty++)
< *dst <<= 4;
< else if (size-- > 0)
< *++dst = 0, dirty = 0;
< else
---
> tmp = (tmp << 4) | n;
> if (++dirty == 2) {
> if (size-- <= 0)
> goto emsgsize;
> *dst++ = (u_char) tmp;
> tmp = 0, dirty = 0;
> }
> }
> if (dirty) {
> if (size-- <= 0)
123a129,130
> tmp <<= 4;
> *dst++ = (u_char) tmp;
125,126d131
< if (dirty)
< size--;

-tih
--
Popularity is the hallmark of mediocrity. --Niles Crane, "Frasier"