Skip to content

fix[security]: use std::map for field ID mapping in ForAllFields #9027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matejsmycka wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −24
Open

fix[security]: use std::map for field ID mapping in ForAllFields #9027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions src/bfbs_gen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#define FLATBUFFERS_BFBS_GEN_H_

#include <cstdint>
#include <map>

#include "flatbuffers/code_generator.h"
#include "flatbuffers/reflection_generated.h"
Expand Down Expand Up @@ -63,16 +64,12 @@ static void ForAllDocumentation(
}
}

// Maps the field index into object->fields() to the field's ID (the ith element
// in the return vector).
static std::vector<uint32_t> FieldIdToIndex(const reflection::Object* object) {
std::vector<uint32_t> field_index_by_id;
field_index_by_id.resize(object->fields()->size());

// Create the mapping of field ID to the index into the vector.
// Maps field ID to the field's index in object->fields().
static std::map<uint32_t, uint32_t> FieldIdToIndex(
const reflection::Object* object) {
std::map<uint32_t, uint32_t> field_index_by_id;
for (uint32_t i = 0; i < object->fields()->size(); ++i) {
auto field = object->fields()->Get(i);
field_index_by_id[field->id()] = i;
field_index_by_id[object->fields()->Get(i)->id()] = i;
}

return field_index_by_id;
Expand Down Expand Up @@ -186,10 +183,15 @@ class BaseBfbsGenerator : public CodeGenerator {

void ForAllFields(const reflection::Object* object, bool reverse,
std::function<void(const reflection::Field*)> func) const {
const std::vector<uint32_t> field_to_id_map = FieldIdToIndex(object);
for (size_t i = 0; i < field_to_id_map.size(); ++i) {
func(object->fields()->Get(
field_to_id_map[reverse ? field_to_id_map.size() - (i + 1) : i]));
const auto field_to_id_map = FieldIdToIndex(object);
if (!reverse) {
for (auto it = field_to_id_map.begin(); it != field_to_id_map.end();
++it)
func(object->fields()->Get(it->second));
} else {
for (auto it = field_to_id_map.rbegin(); it != field_to_id_map.rend();
++it)
func(object->fields()->Get(it->second));
}
}

Expand Down
22 changes: 11 additions & 11 deletions src/reflection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

#include "flatbuffers/reflection.h"

#include <map>

#include "flatbuffers/util.h"

// Helper functionality for reflection.
Expand Down Expand Up @@ -378,18 +380,16 @@ std::string GetAnyValueS(reflection::BaseType type, const uint8_t* data,

void ForAllFields(const reflection::Object* object, bool reverse,
std::function<void(const reflection::Field*)> func) {
std::vector<uint32_t> field_to_id_map;
field_to_id_map.resize(object->fields()->size());

// Create the mapping of field ID to the index into the vector.
for (uint32_t i = 0; i < object->fields()->size(); ++i) {
auto field = object->fields()->Get(i);
field_to_id_map[field->id()] = i;
}
std::map<uint32_t, uint32_t> field_to_id_map;
for (uint32_t i = 0; i < object->fields()->size(); ++i)
field_to_id_map[object->fields()->Get(i)->id()] = i;

for (size_t i = 0; i < field_to_id_map.size(); ++i) {
func(object->fields()->Get(
field_to_id_map[reverse ? field_to_id_map.size() - (i + 1) : i]));
if (!reverse) {
for (auto it = field_to_id_map.begin(); it != field_to_id_map.end(); ++it)
func(object->fields()->Get(it->second));
} else {
for (auto it = field_to_id_map.rbegin(); it != field_to_id_map.rend(); ++it)
func(object->fields()->Get(it->second));
}
}

Expand Down