Skip to content
Snippets Groups Projects
Commit 38351b92 authored by Stephen R. van den Berg's avatar Stephen R. van den Berg
Browse files

Instead of crashing, report non-UTF8 characters in a supposedly UTF8 object.

Rev: lib/modules/Sql.pmod/pgsql.pike:1.71
parent f05e11ea
Branches
Tags
No related merge requests found
...@@ -794,8 +794,8 @@ final int _decodemsg(void|state waitforstate) ...@@ -794,8 +794,8 @@ final int _decodemsg(void|state waitforstate)
case BPCHAROID: case BPCHAROID:
case VARCHAROID: case VARCHAROID:
value=_c.getstring(collen); value=_c.getstring(collen);
if(cenc==UTF8CHARSET) if(cenc==UTF8CHARSET && catch(value=utf8_to_string(value)))
value=utf8_to_string(value); ERROR("%O contains non-%s characters\n",value,UTF8CHARSET);
break; break;
case CHAROID:value=atext?_c.getstring(1):_c.getbyte(); case CHAROID:value=atext?_c.getstring(1):_c.getbyte();
break; break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment