Commit b2d9be92 authored by Michal 'vorner' Vaner's avatar Michal 'vorner' Vaner
Browse files

[2383] Check origin is provided when needed

When the name passed in the string is relative, we need to have the
origin to complete the name with.
parent 0be210a2
......@@ -321,12 +321,22 @@ Name::Name(const std::string &namestring, bool downcase) {
offsets_.assign(offsets.begin(), offsets.end());
Name::Name(const char* namedata, size_t data_len, const Name*, bool downcase) {
Name::Name(const char* namedata, size_t data_len, const Name* origin,
bool downcase)
// Check validity of data
if (namedata == NULL || data_len == 0) {
"No data provided to Name constructor");
// If the last character is not a dot, it is a relative to origin.
// It is safe to check now, we know there's at least one character.
const bool absolute = (namedata[data_len - 1] == '.');
// If we are not absolute, we need the origin to complete the name.
if (!absolute && origin == NULL) {
"No origin available and name is relative");
// Prepare inputs for the parser
const char* end = namedata + data_len;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment