---

yaml --- r: 315051 b: refs/heads/master c: 5c9df5f h: refs/heads/master i: 315049: e5f6d51 315047: 055f32f v: v3
git-mirror · Jul 9, 2012 · 20094fc · 20094fc
1 parent c8748d3
commit 20094fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8efcec5394cbf7ae67ccb137cb1a45ae3e6f6c8
+refs/heads/master: 5c9df5fed198ad8b967f33a1e11862f2a1d08bf7
diff --git a/trunk/net/ax25/ax25_addr.c b/trunk/net/ax25/ax25_addr.c
@@ -189,8 +189,10 @@ const unsigned char *ax25_addr_parse(const unsigned char *buf, int len,
 	digi->ndigi      = 0;
 
 	while (!(buf[-1] & AX25_EBIT)) {
-		if (d >= AX25_MAX_DIGIS)  return NULL;	/* Max of 6 digis */
-		if (len < 7) return NULL;	/* Short packet */
+		if (d >= AX25_MAX_DIGIS)
+			return NULL;
+		if (len < AX25_ADDR_LEN)
+			return NULL;
 
 		memcpy(&digi->calls[d], buf, AX25_ADDR_LEN);
 		digi->ndigi = d + 1;