From 0ba124e805046f65a7ef275ebe9d8254d8f69ed9 Mon Sep 17 00:00:00 2001
From: jcorgan
Date: Wed, 31 Dec 2008 22:33:47 +0000
Subject: Fix USRP2 peek32() max words

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10183 221aa14e-8319-0410-a670-987f0aec2ac5
---
 usrp2/firmware/apps/app_common_v2.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'usrp2/firmware/apps')

diff --git a/usrp2/firmware/apps/app_common_v2.c b/usrp2/firmware/apps/app_common_v2.c
index 635093fbb..c498d3008 100644
--- a/usrp2/firmware/apps/app_common_v2.c
+++ b/usrp2/firmware/apps/app_common_v2.c
@@ -340,7 +340,8 @@ peek_cmd(const op_peek_t *p,
   putstr("peek: addr="); puthex32(p->addr);
   printf(" bytes=%u\n", p->bytes);
 
-  if (reply_payload_space < (sizeof(*r) + p->bytes)) {
+  if ((reply_payload_space < (sizeof(*r) + p->bytes)) ||
+      p->bytes > MAX_SUBPKT_LEN - sizeof(op_generic_t)) {
     putstr("peek: insufficient reply packet space\n");
     return 0;			// FIXME do partial read?
   }
-- 
cgit