From: Marcin Siodelski <marcin@isc.org>
Date: Fri, 8 Jun 2012 16:09:54 +0000 (+0200)
Subject: [1955] Check for null options pointers.
X-Git-Tag: trac2351_base~226^2~58^2~6^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce911b68e171ddced13c91ced5e7a1d417ad62ca;p=thirdparty%2Fkea.git

[1955] Check for null options pointers.
---

diff --git a/tests/tools/perfdhcp/pkt_transform.cc b/tests/tools/perfdhcp/pkt_transform.cc
index 864fe65501..5ed39bfc5f 100644
--- a/tests/tools/perfdhcp/pkt_transform.cc
+++ b/tests/tools/perfdhcp/pkt_transform.cc
@@ -124,6 +124,9 @@ PktTransform::packOptions(const OptionBuffer& in_buffer,
             // Get options with their position (offset).
             boost::shared_ptr<LocalizedOption> option =
                 boost::dynamic_pointer_cast<LocalizedOption>(it->second);
+            if (option == NULL) {
+                isc_throw(isc::BadValue, "option is null");
+            }
             uint32_t offset = option->getOffset();
             if ((offset == 0) ||
                 (offset + option->len() > in_buffer.size())) {
@@ -160,6 +163,9 @@ PktTransform::unpackOptions(const OptionBuffer& in_buffer,
 
         boost::shared_ptr<LocalizedOption> option =
             boost::dynamic_pointer_cast<LocalizedOption>(it->second);
+        if (option == NULL) {
+            isc_throw(isc::BadValue, "option is null");
+        }
         size_t opt_pos = option->getOffset();
         if (opt_pos == 0) {
             isc_throw(isc::BadValue, "failed to unpack packet from raw buffer "