Merge pull request #6359

f9441c5 Fixed string_ref usage bug in epee::from_hex::vector (vtnerd)
2020-04-21 08:38:21 -05:00
parent 2d729fbdf7 f9441c5759
commit 06c81b6527
2 changed files with 6 additions and 3 deletions
@@ -141,7 +141,7 @@ namespace epee
    result.reserve(count / 2);

    // the data to work with (std::string is always null-terminated)
-    auto data = src.data();
+    auto data = src.begin();

    // convert a single hex character to an unsigned integer
    auto char_to_int = [](const char *input) {
@@ -167,9 +167,9 @@ namespace epee
    };

    // keep going until we reach the end
-    while (data[0] != '\0') {
+    while (data != src.end()) {
      // skip unwanted characters
-      if (!include(data[0])) {
+      if (!include(*data)) {
        ++data;
        continue;
      }