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

Fix contrib/hstore to throw an error for keys or values that don't fit in its

Browse Source 
data structure, rather than silently truncating them.  Andrew Gierth
This commit is contained in:
Tom Lane 2009-03-15 22:05:44 +00:00
parent 7e23229904
commit 98686e1ea1
4 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/hstore/README.hstore
View File

@ -184,3 +184,7 @@ select key, count(*) from (select (each(h)).key from testhstore) as stat group b
title | 190 title | 190
org | 189 org | 189
................... ...................
In the current implementation, neither the key nor the value
string can exceed 65535 bytes in length; an error will be thrown if this
limit is exceeded. These maximum lengths may change in future releases.

8
contrib/hstore/hstore.h
View File

@ -20,6 +20,11 @@ typedef struct
pos:31; pos:31;
} HEntry; } HEntry;
/* these are determined by the sizes of the keylen and vallen fields */
/* in struct HEntry and struct Pairs */
#define HSTORE_MAX_KEY_LEN 65535
#define HSTORE_MAX_VALUE_LEN 65535
typedef struct typedef struct
{ {
@ -49,4 +54,7 @@ typedef struct
int comparePairs(const void *a, const void *b); int comparePairs(const void *a, const void *b);
int uniquePairs(Pairs * a, int4 l, int4 *buflen); int uniquePairs(Pairs * a, int4 l, int4 *buflen);
size_t hstoreCheckKeyLen(size_t len);
size_t hstoreCheckValLen(size_t len);
#endif #endif

25
contrib/hstore/hstore_io.c
View File

@ -182,7 +182,7 @@ parse_hstore(HSParser * state)
state->pairs = (Pairs *) repalloc(state->pairs, sizeof(Pairs) * state->plen); state->pairs = (Pairs *) repalloc(state->pairs, sizeof(Pairs) * state->plen);
} }
state->pairs[state->pcur].key = state->word; state->pairs[state->pcur].key = state->word;
state->pairs[state->pcur].keylen = state->cur - state->word; state->pairs[state->pcur].keylen = hstoreCheckKeyLen(state->cur - state->word);
state->pairs[state->pcur].val = NULL; state->pairs[state->pcur].val = NULL;
state->word = NULL; state->word = NULL;
st = WEQ; st = WEQ;
@ -222,7 +222,7 @@ parse_hstore(HSParser * state)
if (!get_val(state, true, &escaped)) if (!get_val(state, true, &escaped))
elog(ERROR, "Unexpected end of string"); elog(ERROR, "Unexpected end of string");
state->pairs[state->pcur].val = state->word; state->pairs[state->pcur].val = state->word;
state->pairs[state->pcur].vallen = state->cur - state->word; state->pairs[state->pcur].vallen = hstoreCheckValLen(state->cur - state->word);
state->pairs[state->pcur].isnull = false; state->pairs[state->pcur].isnull = false;
state->pairs[state->pcur].needfree = true; state->pairs[state->pcur].needfree = true;
if (state->cur - state->word == 4 && !escaped) if (state->cur - state->word == 4 && !escaped)
@ -341,6 +341,27 @@ freeHSParse(HSParser * state)
pfree(state->pairs); pfree(state->pairs);
} }
size_t
hstoreCheckKeyLen(size_t len)
{
if (len > HSTORE_MAX_KEY_LEN)
ereport(ERROR,
(errcode(ERRCODE_STRING_DATA_RIGHT_TRUNCATION),
errmsg("string too long for hstore key")));
return len;
}
size_t
hstoreCheckValLen(size_t len)
{
if (len > HSTORE_MAX_VALUE_LEN)
ereport(ERROR,
(errcode(ERRCODE_STRING_DATA_RIGHT_TRUNCATION),
errmsg("string too long for hstore value")));
return len;
}
PG_FUNCTION_INFO_V1(hstore_in); PG_FUNCTION_INFO_V1(hstore_in);
Datum hstore_in(PG_FUNCTION_ARGS); Datum hstore_in(PG_FUNCTION_ARGS);
Datum Datum

4
contrib/hstore/hstore_op.c
View File

@ -280,8 +280,8 @@ tconvert(PG_FUNCTION_ARGS)
out->len = len; out->len = len;
out->size = 1; out->size = 1;
ARRPTR(out)->keylen = VARSIZE(key) - VARHDRSZ; ARRPTR(out)->keylen = hstoreCheckKeyLen(VARSIZE(key) - VARHDRSZ);
ARRPTR(out)->vallen = VARSIZE(val) - VARHDRSZ; ARRPTR(out)->vallen = hstoreCheckValLen(VARSIZE(val) - VARHDRSZ);
ARRPTR(out)->valisnull = false; ARRPTR(out)->valisnull = false;
ARRPTR(out)->pos = 0; ARRPTR(out)->pos = 0;