diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/libpq/md5.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/adt/varlena.c | 14 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/backend/libpq/md5.c b/src/backend/libpq/md5.c index 16649abe24f..3c7fcd69127 100644 --- a/src/backend/libpq/md5.c +++ b/src/backend/libpq/md5.c @@ -14,7 +14,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/libpq/md5.c,v 1.27 2004/12/31 21:59:50 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/libpq/md5.c,v 1.28 2005/02/23 22:46:17 neilc Exp $ */ @@ -289,8 +289,8 @@ bytesToHex(uint8 b[16], char *s) * characters. you thus need to provide an array * of 33 characters, including the trailing '\0'. * - * RETURNS 0 on failure (out of memory for internal buffers) or - * non-zero on success. + * RETURNS false on failure (out of memory for internal buffers) or + * true on success. * * STANDARDS MD5 is described in RFC 1321. * diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index a2570a66bbe..26fcab20d35 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.118 2004/12/31 22:01:22 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.119 2005/02/23 22:46:17 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -2310,16 +2310,22 @@ to_hex64(PG_FUNCTION_ARGS) Datum md5_text(PG_FUNCTION_ARGS) { - char *buff = PG_TEXT_GET_STR(PG_GETARG_TEXT_P(0)); - size_t len = strlen(buff); + text *in_text = PG_GETARG_TEXT_P(0); + size_t len; char *hexsum; text *result_text; + /* Calculate the length of the buffer using varlena metadata */ + len = VARSIZE(in_text) - VARHDRSZ; + /* leave room for the terminating '\0' */ hexsum = (char *) palloc(MD5_HASH_LEN + 1); /* get the hash result */ - md5_hash((void *) buff, len, hexsum); + if (md5_hash(VARDATA(in_text), len, hexsum) == false) + ereport(ERROR, + (errcode(ERRCODE_OUT_OF_MEMORY), + errmsg("out of memory"))); /* convert to text and return it */ result_text = PG_STR_GET_TEXT(hexsum); |