commit 5d75fd9473f330e71eca5477e496aa240873314f
author Junxiao Shi <git@mail1.yoursunny.com> Tue Aug 08 18:09:20 2017 +0000
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Aug 08 17:16:19 2017 -0400
tree 4f861c99f76cc86b38f2d736010f1c812d66a203
parent d9153ce79242c514818683d18fe0433fe56c65c9

mgmt: check enum range during decoding

This commit also makes use of prependStringBlock and readString
functions in encode/decode routines.

refs #3974

Change-Id: I86a4f16ea6f50fffeff72c8b416878740e65ef2a

src/mgmt/control-response.cpp

diff --git a/src/mgmt/control-response.cpp b/src/mgmt/control-response.cpp
index a0c74c2..9d82d40 100644
--- a/src/mgmt/control-response.cpp
+++ b/src/mgmt/control-response.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2017 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -56,8 +56,7 @@
 
   m_wire = Block(tlv::nfd::ControlResponse);
   m_wire.push_back(makeNonNegativeIntegerBlock(tlv::nfd::StatusCode, m_code));
-
-  m_wire.push_back(makeBinaryBlock(tlv::nfd::StatusText, m_text.c_str(), m_text.size()));
+  m_wire.push_back(makeStringBlock(tlv::nfd::StatusText, m_text));
 
   if (m_body.hasWire()) {
     m_wire.push_back(m_body);
@@ -74,20 +73,19 @@
   m_wire.parse();
 
   if (m_wire.type() != tlv::nfd::ControlResponse)
-    throw Error("Requested decoding of ControlResponse, but Block is of different type");
+    BOOST_THROW_EXCEPTION(Error("expected ControlResponse, got " + to_string(m_wire.type()) + " element"));
 
   Block::element_const_iterator val = m_wire.elements_begin();
   if (val == m_wire.elements_end() || val->type() != tlv::nfd::StatusCode) {
-    throw Error("Incorrect ControlResponse format (StatusCode missing or not the first item)");
+    BOOST_THROW_EXCEPTION(Error("missing StatusCode sub-element"));
   }
-
   m_code = readNonNegativeInteger(*val);
   ++val;
 
   if (val == m_wire.elements_end() || val->type() != tlv::nfd::StatusText) {
-    throw Error("Incorrect ControlResponse format (StatusText missing or not the second item)");
+    BOOST_THROW_EXCEPTION(Error("missing StatusText sub-element"));
   }
-  m_text.assign(reinterpret_cast<const char*>(val->value()), val->value_size());
+  m_text = readString(*val);
   ++val;
 
   if (val != m_wire.elements_end())