X-Git-Url: https://git.decadent.org.uk/gitweb/?p=odhcp6c.git;a=blobdiff_plain;f=src%2Fscript.c;fp=src%2Fscript.c;h=fdc050bbccb6d5f02ce24c594af2d0d0a3e6c6de;hp=b20e94c9460c92ae45312bf48436ad73e0dd2d89;hb=ec7f4701b348f5c4c3191ca83ecd8453c431c432;hpb=3609bab1361ed3f92e19f7309dd6e7fd64bc4083

diff --git a/src/script.c b/src/script.c
index b20e94c..fdc050b 100644
--- a/src/script.c
+++ b/src/script.c
@@ -220,8 +220,9 @@ static void search_to_env(const char *name, const uint8_t *start, size_t len)
 	*c++ = '=';
 
 	for (struct odhcp6c_entry *e = (struct odhcp6c_entry*)start;
-				(uint8_t*)e < &start[len] && &e->auxtarget[e->auxlen] <= &start[len];
-				e = (struct odhcp6c_entry*)(&e->auxtarget[e->auxlen])) {
+				(uint8_t*)e < &start[len] &&
+				(uint8_t*)odhcp6c_next_entry(e) <= &start[len];
+				e = odhcp6c_next_entry(e)) {
 		c = mempcpy(c, e->auxtarget, e->auxlen);
 		*c++ = ' ';
 	}