diff options
| author | Pavan Deolasee | 2015-05-05 09:19:18 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2015-05-05 09:19:18 +0000 |
| commit | 73fa25c67cbfa24c03e28c96bf356f2592671730 (patch) | |
| tree | 10ded7e26abd78d93658cb72fc5cb9d4672eff2a /contrib/pgcrypto/px-crypt.c | |
| parent | da4d108859bcd7a308ca75aba54281e32968822c (diff) | |
| parent | 4a9ab6d8619817f9e3989c99b65140e19041dab7 (diff) | |
Merge branch 'XL_MASTER_MERGE_9_4' into XL_NEW_MASTER
Conflicts:
src/test/regress/expected/aggregates.out
src/test/regress/expected/create_index.out
src/test/regress/expected/inherit.out
src/test/regress/expected/join.out
src/test/regress/expected/window.out
src/test/regress/expected/with.out
Diffstat (limited to 'contrib/pgcrypto/px-crypt.c')
| -rw-r--r-- | contrib/pgcrypto/px-crypt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/pgcrypto/px-crypt.c b/contrib/pgcrypto/px-crypt.c index 63ec038dc5..7b003a76ca 100644 --- a/contrib/pgcrypto/px-crypt.c +++ b/contrib/pgcrypto/px-crypt.c @@ -17,7 +17,7 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) @@ -158,7 +158,7 @@ px_gen_salt(const char *salt_type, char *buf, int rounds) return res; p = g->gen(rounds, rbuf, g->input_len, buf, PX_MAX_SALT_LEN); - memset(rbuf, 0, sizeof(rbuf)); + px_memset(rbuf, 0, sizeof(rbuf)); if (p == NULL) return PXE_BAD_SALT_ROUNDS; |