diff --git a/src/dnsmasq.h b/src/dnsmasq.h
index 2c5f964..9af3a2c 100644
--- a/src/dnsmasq.h
+++ b/src/dnsmasq.h
@@ -684,7 +684,7 @@
 unsigned short rand16(void);
 int legal_hostname(char* c);
 char* canonicalise(char* s, int* nomem);
-unsigned char* do_rfc1035_name(unsigned char* p, char* sval);
+unsigned char* do_rfc1035_name(unsigned char* p, char* sval, char *limit);
 void* safe_malloc(size_t size);
 void safe_pipe(int* fd, int read_noblock);
 void* whine_malloc(size_t size);
diff --git a/src/rfc1035.c b/src/rfc1035.c
index 0f883e1..47479ab 100644
--- a/src/rfc1035.c
+++ b/src/rfc1035.c
@@ -847,9 +847,19 @@
     unsigned short usval;
     long lval;
     char* sval;
+#define CHECK_LIMIT(size) \
+    if (limit && p + (size) > (unsigned char*)limit) { \
+        va_end(ap); \
+        goto truncated; \
+    }
 
     if (truncp && *truncp) return 0;
 
+    va_start(ap, format); /* make ap point to 1st unamed argument */
+
+   /* nameoffset (1 or 2) + type (2) + class (2) + ttl (4) + 0 (2) */
+    CHECK_LIMIT(12);
+
     PUTSHORT(nameoffset | 0xc000, p);
     PUTSHORT(type, p);
     PUTSHORT(class, p);
@@ -858,11 +868,10 @@
     sav = p;        /* Save pointer to RDLength field */
     PUTSHORT(0, p); /* Placeholder RDLength */
 
-    va_start(ap, format); /* make ap point to 1st unamed argument */
-
     for (; *format; format++) switch (*format) {
 #ifdef HAVE_IPV6
             case '6':
+                CHECK_LIMIT(IN6ADDRSZ);
                 sval = va_arg(ap, char*);
                 memcpy(p, sval, IN6ADDRSZ);
                 p += IN6ADDRSZ;
@@ -870,17 +879,20 @@
 #endif
 
             case '4':
+                CHECK_LIMIT(INADDRSZ);
                 sval = va_arg(ap, char*);
                 memcpy(p, sval, INADDRSZ);
                 p += INADDRSZ;
                 break;
 
             case 's':
+                CHECK_LIMIT(2);
                 usval = va_arg(ap, int);
                 PUTSHORT(usval, p);
                 break;
 
             case 'l':
+                CHECK_LIMIT(4);
                 lval = va_arg(ap, long);
                 PUTLONG(lval, p);
                 break;
@@ -888,12 +900,18 @@
             case 'd':
                 /* get domain-name answer arg and store it in RDATA field */
                 if (offset) *offset = p - (unsigned char*) header;
-                p = do_rfc1035_name(p, va_arg(ap, char*));
+                p = do_rfc1035_name(p, va_arg(ap, char*), limit);
+                if (!p) {
+                    va_end(ap);
+                    goto truncated;
+                }
+                CHECK_LIMIT(1);
                 *p++ = 0;
                 break;
 
             case 't':
                 usval = va_arg(ap, int);
+                CHECK_LIMIT(usval);
                 sval = va_arg(ap, char*);
                 memcpy(p, sval, usval);
                 p += usval;
@@ -903,19 +921,23 @@
                 sval = va_arg(ap, char*);
                 usval = sval ? strlen(sval) : 0;
                 if (usval > 255) usval = 255;
+                CHECK_LIMIT(usval + 1);
                 *p++ = (unsigned char) usval;
                 memcpy(p, sval, usval);
                 p += usval;
                 break;
         }
 
+#undef CHECK_LIMIT
     va_end(ap); /* clean up variable argument pointer */
 
     j = p - sav - 2;
+    /* this has already been checked against limit before */
     PUTSHORT(j, sav); /* Now, store real RDLength */
 
     /* check for overflow of buffer */
     if (limit && ((unsigned char*) limit - p) < 0) {
+truncated:
         if (truncp) *truncp = 1;
         return 0;
     }
diff --git a/src/rfc2131.c b/src/rfc2131.c
index f74ecb9..c0f649a 100644
--- a/src/rfc2131.c
+++ b/src/rfc2131.c
@@ -1889,8 +1889,8 @@
                 *(p++) = 255;
 
                 if (fqdn_flags & 0x04) {
-                    p = do_rfc1035_name(p, hostname);
-                    if (domain) p = do_rfc1035_name(p, domain);
+                    p = do_rfc1035_name(p, hostname, NULL);
+                    if (domain) p = do_rfc1035_name(p, domain, NULL);
                     *p++ = 0;
                 } else {
                     memcpy(p, hostname, strlen(hostname));
diff --git a/src/util.c b/src/util.c
index 53e3137..11b43a0 100644
--- a/src/util.c
+++ b/src/util.c
@@ -190,12 +190,19 @@
     return ret;
 }
 
-unsigned char* do_rfc1035_name(unsigned char* p, char* sval) {
+unsigned char* do_rfc1035_name(unsigned char* p, char* sval, char *limit) {
     int j;
 
     while (sval && *sval) {
+        if (limit && p + 1 > (unsigned char*)limit)
+            return p;
+
         unsigned char* cp = p++;
-        for (j = 0; *sval && (*sval != '.'); sval++, j++) *p++ = *sval;
+        for (j = 0; *sval && (*sval != '.'); sval++, j++) {
+            if (limit && p + 1 > (unsigned char*)limit)
+                return p;
+            *p++ = *sval;
+        }
         *cp = j;
         if (*sval) sval++;
     }