Merge pull request #167 from darkfronza/PG-325_fix_deadlock_master

PG-325: Fix deadlock.
pull/170/head
Ibrar Ahmed 2022-01-13 22:08:29 +05:00 committed by GitHub
commit eb9e1c1d49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions

View File

@ -1701,8 +1701,8 @@ pg_stat_monitor_internal(FunctionCallInfo fcinfo,
char parentid_txt[32];
pgssSharedState *pgss = pgsm_get_ss();
HTAB *pgss_hash = pgsm_get_hash();
char *query_txt = (char*) palloc0(PGSM_QUERY_MAX_LEN);
char *parent_query_txt = (char*) palloc0(PGSM_QUERY_MAX_LEN);
char *query_txt = (char*) palloc0(PGSM_QUERY_MAX_LEN + 1);
char *parent_query_txt = (char*) palloc0(PGSM_QUERY_MAX_LEN + 1);
/* Safety check... */
if (!IsSystemInitialized())
@ -2073,11 +2073,12 @@ pg_stat_monitor_internal(FunctionCallInfo fcinfo,
values[i++] = BoolGetDatum(toplevel);
tuplestore_putvalues(tupstore, tupdesc, values, nulls);
}
pfree(query_txt);
pfree(parent_query_txt);
/* clean up and return the tuplestore */
LWLockRelease(pgss->lock);
pfree(query_txt);
pfree(parent_query_txt);
tuplestore_donestoring(tupstore);
}