ead: message handling fixes
authorFelix Fietkau <nbd@openwrt.org>
Fri, 2 Jan 2009 23:51:57 +0000 (23:51 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Fri, 2 Jan 2009 23:51:57 +0000 (23:51 +0000)
SVN-Revision: 13828

package/ead/src/ead-client.c
package/ead/src/ead.c

index 111dc8a..14e04c4 100644 (file)
@@ -143,7 +143,10 @@ static bool
 handle_pong(void)
 {
        struct ead_msg_pong *pong = EAD_DATA(msg, pong);
-       int len = msg->len - sizeof(struct ead_msg_pong);
+       int len = ntohl(msg->len) - sizeof(struct ead_msg_pong);
+
+       if (len <= 0)
+               return false;
 
        pong->name[len] = 0;
        auth_type = ntohs(pong->auth_type);
index 7367c38..c4d3dd9 100644 (file)
@@ -330,7 +330,7 @@ handle_ping(struct ead_packet *pkt, int len, int *nstate)
 
        msg->len = htonl(sizeof(struct ead_msg_pong) + slen);
        strncpy(pong->name, dev_name, slen);
-       pong->name[len] = 0;
+       pong->name[slen] = 0;
        pong->auth_type = htons(EAD_AUTH_MD5);
 
        return true;