Re: PQclientEncoding() returns -1, resulting in possible assertion failure in psql

On Sat, Mar 22, 2014 at 08:17:11PM -0400, Bruce Momjian wrote:
> On Sat, Mar 22, 2014 at 11:55:56AM -0400, Tom Lane wrote:
> > Bruce Momjian <bruce(at)momjian(dot)us> writes:
> > > OK, hearing nothing, I dug into this, and I think the solution is
> > > simpler than we thought. Basically, the Assert is checking for the
> > > encoding value to be in a valid range, but the main code is also
> > > checking for an invalid encoding and returning PG_SQL_ASCII:
> >
> > Agreed that that's pretty useless. I wonder though why these functions
> > are not coded like
> >
> > return PG_VALID_ENCODING(encoding) ?
> > ((*pg_wchar_table[encoding].mblen) ((const unsigned char *) mbstr)) :
> > ((*pg_wchar_table[PG_SQL_ASCII].mblen) ((const unsigned char *) mbstr)));
> >
> > instead of the hard-to-read explicit range check.
>
> Agreed. Modified patch attached.

Patch applied. I did not backpatch because it only affects assert
builds, which I assume is only being done in head.

--
Bruce Momjian <bruce(at)momjian(dot)us> http://momjian.us
EnterpriseDB http://enterprisedb.com

+ Everyone has their own god. +