summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2005-07-18 15:55:01 +0000
committerTom Lane2005-07-18 15:55:01 +0000
commita55a75f02dd83761d201030e11277ebbba27a1bc (patch)
tree705d90ea5a4a25ab857344af4a91e99e3c713f6e
parent84e5ce7eb9c193586cca94a3de771c3188fd708e (diff)
MemSet() must not cast its pointer argument to int32* until after it has
checked that the pointer is actually word-aligned. Casting a non-aligned pointer to int32* is technically illegal per the C spec, and some recent versions of gcc actually generate bad code for the memset() when given such a pointer. Per report from Andrew Morrow.
-rw-r--r--src/include/c.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/include/c.h b/src/include/c.h
index 67484f4c96e..67e4f49c35c 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -12,7 +12,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: c.h,v 1.114 2002/01/22 19:02:39 tgl Exp $
+ * $Id: c.h,v 1.114.2.1 2005/07/18 15:55:01 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -560,21 +560,22 @@ typedef NameData *Name;
#define MemSet(start, val, len) \
do \
{ \
- int32 * _start = (int32 *) (start); \
+ void *_vstart = (void *) (start); \
int _val = (val); \
Size _len = (len); \
\
- if ((((long) _start) & INT_ALIGN_MASK) == 0 && \
+ if ((((long) _vstart) & INT_ALIGN_MASK) == 0 && \
(_len & INT_ALIGN_MASK) == 0 && \
_val == 0 && \
_len <= MEMSET_LOOP_LIMIT) \
{ \
- int32 * _stop = (int32 *) ((char *) _start + _len); \
+ int32 *_start = (int32 *) _vstart; \
+ int32 *_stop = (int32 *) ((char *) _start + _len); \
while (_start < _stop) \
*_start++ = 0; \
} \
else \
- memset((char *) _start, _val, _len); \
+ memset(_vstart, _val, _len); \
} while (0)
#define MEMSET_LOOP_LIMIT 64