From: Ondrej Zajicek Date: Sun, 11 Jan 2009 09:51:54 +0000 (+0100) Subject: Move check for NULL before usage of variable. X-Git-Tag: v1.2.0~158 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e9617e400d54f6f5119a24e7380b7719c2fc3dd;p=thirdparty%2Fbird.git Move check for NULL before usage of variable. --- diff --git a/proto/ospf/packet.c b/proto/ospf/packet.c index ee3528270..5d47c48ef 100644 --- a/proto/ospf/packet.c +++ b/proto/ospf/packet.c @@ -232,6 +232,12 @@ ospf_rx_hook(sock * sk, int size) ps = (struct ospf_packet *) ipv4_skip_header(sk->rbuf, &size); + if (ps == NULL) + { + log(L_ERR "%s%I - bad IP header", mesg, sk->faddr); + return 1; + } + if ((ifa->oa->areaid != 0) && (ntohl(ps->areaid) == 0)) { WALK_LIST(iff, po->iface_list) @@ -247,11 +253,6 @@ ospf_rx_hook(sock * sk, int size) DBG("%s: RX_Hook called on interface %s.\n", p->name, sk->iface->name); osize = ntohs(ps->length); - if (ps == NULL) - { - log(L_ERR "%s%I - bad IP header", mesg, sk->faddr); - return 1; - } if ((unsigned) size < sizeof(struct ospf_packet)) {