Skip to content

Commit ac47950

Browse files
committed
Guard against 0 length string encoding conversion case.
1 parent 9645fa8 commit ac47950

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/backend/utils/mb/mbutils.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* (currently mule internal code (mic) is used)
55
* Tatsuo Ishii
66
*
7-
* $Header: /cvsroot/pgsql/src/backend/utils/mb/mbutils.c,v 1.36 2002/11/02 18:41:22 tgl Exp $
7+
* $Header: /cvsroot/pgsql/src/backend/utils/mb/mbutils.c,v 1.37 2002/11/26 02:22:29 ishii Exp $
88
*/
99
#include "postgres.h"
1010

@@ -165,6 +165,9 @@ pg_do_encoding_conversion(unsigned char *src, int len,
165165
if (src_encoding == PG_SQL_ASCII || dest_encoding == PG_SQL_ASCII)
166166
return src;
167167

168+
if (len <= 0)
169+
return src;
170+
168171
proc = FindDefaultConversionProc(src_encoding, dest_encoding);
169172
if (!OidIsValid(proc))
170173
{
@@ -320,6 +323,9 @@ perform_default_encoding_conversion(unsigned char *src, int len, bool is_client_
320323
dest_encoding;
321324
FmgrInfo *flinfo;
322325

326+
if (len <= 0)
327+
return src;
328+
323329
if (is_client_to_server)
324330
{
325331
src_encoding = ClientEncoding->encoding;

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy