diff options
| author | Adrian Chadd <adrian@FreeBSD.org> | 2020-11-02 15:01:37 +0000 |
|---|---|---|
| committer | Adrian Chadd <adrian@FreeBSD.org> | 2020-11-02 15:01:37 +0000 |
| commit | 26c29e743bbdbb82762540f72d4bc449bae2e092 (patch) | |
| tree | 9d8a88f01e8a76e92da69a6a429c3deb31457a62 /lib | |
| parent | 44a1b2f07b0ea5ef1ccc64c1ee2b54569e8a357a (diff) | |
| download | src-26c29e743bbdbb82762540f72d4bc449bae2e092.tar.gz src-26c29e743bbdbb82762540f72d4bc449bae2e092.zip | |
[libnetmap] Fix 32 bit compilation under gcc-6.4
Use uintptr_t to cast a uint64_t to a pointer type.
Yeah, it isn't technically correct for platforms with pointers
> 64 bits, but it's fine here.
This fixes 32 bit compat library builds on amd64 and also
mips32 builds.
Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D26790
Notes
Notes:
svn path=/head/; revision=367273
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libnetmap/nmreq.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/libnetmap/nmreq.c b/lib/libnetmap/nmreq.c index 259056de37b4..7f4b2703d22d 100644 --- a/lib/libnetmap/nmreq.c +++ b/lib/libnetmap/nmreq.c @@ -603,10 +603,9 @@ nmreq_options_decode(const char *opt, struct nmreq_opt_parser parsers[], struct nmreq_option * nmreq_find_option(struct nmreq_header *h, uint32_t t) { - struct nmreq_option *o; + struct nmreq_option *o = NULL; - for (o = (struct nmreq_option *)h->nr_options; o != NULL; - o = (struct nmreq_option *)o->nro_next) { + nmreq_foreach_option(h, o) { if (o->nro_reqtype == t) break; } @@ -633,8 +632,14 @@ nmreq_free_options(struct nmreq_header *h) { struct nmreq_option *o, *next; - for (o = (struct nmreq_option *)h->nr_options; o != NULL; o = next) { - next = (struct nmreq_option *)o->nro_next; + /* + * Note: can't use nmreq_foreach_option() here; it frees the + * list as it's walking and nmreq_foreach_option() isn't + * modification-safe. + */ + for (o = (struct nmreq_option *)(uintptr_t)h->nr_options; o != NULL; + o = next) { + next = (struct nmreq_option *)(uintptr_t)o->nro_next; free(o); } } |