diff options
| author | Michael West <michael.west@ettus.com> | 2013-11-20 12:14:24 -0800 |
|---|---|---|
| committer | Michael West <michael.west@ettus.com> | 2013-11-20 12:14:24 -0800 |
| commit | 6ff935e6955be81f30606d0444a265ea03dc6f5d (patch) | |
| tree | 27745786f543858b99d22de1d87f87da9f905f15 /host/lib/usrp/common | |
| parent | 1fe3db82d6d292a186fe26e728dfdf68db4db056 (diff) | |
| parent | 265e94473130ffefc95d4eb67e8d46ce50982be4 (diff) | |
| download | uhd-6ff935e6955be81f30606d0444a265ea03dc6f5d.tar.gz uhd-6ff935e6955be81f30606d0444a265ea03dc6f5d.tar.bz2 uhd-6ff935e6955be81f30606d0444a265ea03dc6f5d.zip | |
Merge remote branch
Diffstat (limited to 'host/lib/usrp/common')
| -rw-r--r-- | host/lib/usrp/common/fx2_ctrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/common/fx2_ctrl.cpp b/host/lib/usrp/common/fx2_ctrl.cpp index 1cacc45cf..d68bf6058 100644 --- a/host/lib/usrp/common/fx2_ctrl.cpp +++ b/host/lib/usrp/common/fx2_ctrl.cpp @@ -119,7 +119,7 @@ bool parse_record(std::string *record, unsigned int &len, std::istringstream(record->substr(3, 4)) >> std::hex >> addr; std::istringstream(record->substr(7, 2)) >> std::hex >> type; - if (len >2 * (record->length() - 9)) // sanity check to prevent buffer overrun + if (len > (2 * (record->length() - 9))) // sanity check to prevent buffer overrun return false; for (i = 0; i < len; i++) { @@ -184,7 +184,7 @@ public: std::string record; file >> record; - if (!record.length() > 0) + if (!(record.length() > 0)) continue; //check for valid record |