aboutsummaryrefslogtreecommitdiff
path: root/src/core/ngx_palloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/ngx_palloc.c')
-rw-r--r--src/core/ngx_palloc.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c
index 4288bf10a..2e72a0f3b 100644
--- a/src/core/ngx_palloc.c
+++ b/src/core/ngx_palloc.c
@@ -97,10 +97,21 @@ ngx_palloc(ngx_pool_t *pool, size_t size)
for ( ;; ) {
+#if (NGX_HAVE_NONALIGNED)
+
+ /*
+ * allow non-aligned memory blocks for small allocations (1, 2,
+ * or 3 bytes) and for odd length strings (struct's have aligned
+ * size)
+ */
+
if (size < sizeof(int) || (size & 1)) {
m = p->last;
- } else {
+ } else
+#endif
+
+ {
m = ngx_align_ptr(p->last, NGX_ALIGNMENT);
}