mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-30 19:00:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

pgstat's truncation of query string needs to be multibyte-aware.

Browse Source 
Patch from sugita@sra.co.jp.
This commit is contained in:
Tom Lane 2002-02-07 22:20:26 +00:00
parent fe1a9c3362
commit 0cc9917bb6
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/postmaster/pgstat.c
View File

@ -16,7 +16,7 @@
* *
* Copyright (c) 2001, PostgreSQL Global Development Group * Copyright (c) 2001, PostgreSQL Global Development Group
* *
* $Header: /cvsroot/pgsql/src/backend/postmaster/pgstat.c,v 1.16 2001/12/03 19:02:58 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/postmaster/pgstat.c,v 1.17 2002/02/07 22:20:26 tgl Exp $
* ---------- * ----------
*/ */
#include "postgres.h" #include "postgres.h"
@ -38,6 +38,9 @@
#include "catalog/pg_shadow.h" #include "catalog/pg_shadow.h"
#include "catalog/pg_database.h" #include "catalog/pg_database.h"
#include "libpq/pqsignal.h" #include "libpq/pqsignal.h"
#ifdef MULTIBYTE
#include "mb/pg_wchar.h"
#endif
#include "miscadmin.h" #include "miscadmin.h"
#include "utils/memutils.h" #include "utils/memutils.h"
#include "storage/backendid.h" #include "storage/backendid.h"
@ -424,8 +427,12 @@ pgstat_report_activity(char *what)
return; return;
len = strlen(what); len = strlen(what);
#ifdef MULTIBYTE
len = pg_mbcliplen((const unsigned char *)what, len, PGSTAT_ACTIVITY_SIZE - 1);
#else
if (len >= PGSTAT_ACTIVITY_SIZE) if (len >= PGSTAT_ACTIVITY_SIZE)
len = PGSTAT_ACTIVITY_SIZE - 1; len = PGSTAT_ACTIVITY_SIZE - 1;
#endif
memcpy(msg.m_what, what, len); memcpy(msg.m_what, what, len);
msg.m_what[len] = '\0'; msg.m_what[len] = '\0';