]> git.ipfire.org Git - thirdparty/ldns.git/commitdiff
fixed two possible nullpointers
authorJelte Jansen <jeltejan@NLnetLabs.nl>
Tue, 4 Apr 2006 09:09:50 +0000 (09:09 +0000)
committerJelte Jansen <jeltejan@NLnetLabs.nl>
Tue, 4 Apr 2006 09:09:50 +0000 (09:09 +0000)
rr.c

diff --git a/rr.c b/rr.c
index 8d21ea1cacdd1fce274881ad5d63bcddf7936b0a..ed7c37ebd252b50b79ddd0b499f00a81160fe7fa 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -255,7 +255,7 @@ ldns_rr_new_frm_str(const char *str, uint16_t default_ttl, ldns_rdf *origin,
                if (strlen(owner) == 0) {
                        /* no ownername was given, try prev, if that fails 
                         * origin, else default to root */
-                       if (*prev) {
+                       if (prev && *prev) {
                                ldns_rr_set_owner(new, ldns_rdf_clone(*prev));
                        } else if (origin) {
                                ldns_rr_set_owner(new, ldns_rdf_clone(origin));
@@ -508,7 +508,7 @@ ldns_rr_new_frm_fp_l(FILE *fp, uint16_t *default_ttl, ldns_rdf **origin, ldns_rd
                        *default_ttl = (uint16_t) atoi(keyword + 5);
                }
        } else {
-               if (*origin) {
+               if (origin && *origin) {
                        rr = ldns_rr_new_frm_str((const char*) line, ttl, *origin, prev);
                } else {
                        rr = ldns_rr_new_frm_str((const char*) line, ttl, NULL, prev);