mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-24 02:03:03 +01:00
1.- Style.
2.- Cleanup. 3.- Fix an invalid memory access when returning data member belonging to an object from the stack in ConfObject::getConcatenatedValues. I didn't see a runtime error because I don't use the feature, but reading the code is enough.
This commit is contained in:
robocop
parent
db995b0d02
commit
f075a729a5
@ -1,19 +1,19 @@
|
||||
/*
|
||||
*
|
||||
* The contents of this file are subject to the Initial
|
||||
* Developer's Public License Version 1.0 (the "License");
|
||||
* you may not use this file except in compliance with the
|
||||
* License. You may obtain a copy of the License at
|
||||
* http://www.ibphoenix.com/idpl.html.
|
||||
*
|
||||
* Software distributed under the License is distributed on
|
||||
* an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
|
||||
* express or implied. See the License for the specific
|
||||
* The contents of this file are subject to the Initial
|
||||
* Developer's Public License Version 1.0 (the "License");
|
||||
* you may not use this file except in compliance with the
|
||||
* License. You may obtain a copy of the License at
|
||||
* http://www.ibphoenix.com/idpl.html.
|
||||
*
|
||||
* Software distributed under the License is distributed on
|
||||
* an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
|
||||
* express or implied. See the License for the specific
|
||||
* language governing rights and limitations under the License.
|
||||
*
|
||||
* The contents of this file or any work derived from this file
|
||||
* may not be distributed under any other license whatsoever
|
||||
* without the express prior written permission of the original
|
||||
* may not be distributed under any other license whatsoever
|
||||
* without the express prior written permission of the original
|
||||
* author.
|
||||
*
|
||||
*
|
||||
@ -37,27 +37,27 @@
|
||||
#ifdef _WIN32
|
||||
#ifndef strcasecmp
|
||||
#define strcasecmp stricmp
|
||||
#define strncasecmp strnicmp
|
||||
//#define strncasecmp strnicmp
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define IS_DIGIT(c) (c >= '0' && c <= '9')
|
||||
|
||||
struct BooleanName
|
||||
{
|
||||
{
|
||||
const char *string;
|
||||
bool value;
|
||||
};
|
||||
};
|
||||
|
||||
static const BooleanName booleanNames [] =
|
||||
{
|
||||
static const BooleanName booleanNames [] =
|
||||
{
|
||||
{"yes", true},
|
||||
{"true", true},
|
||||
{"false", false},
|
||||
{"no", false},
|
||||
{NULL}
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
ConfObject::ConfObject(ConfigFile *confFile) :
|
||||
source(getPool()), tempValue(getPool())
|
||||
{
|
||||
@ -70,7 +70,7 @@ ConfObject::ConfObject(ConfigFile *confFile) :
|
||||
ConfObject::~ConfObject()
|
||||
{
|
||||
configFile->release();
|
||||
|
||||
|
||||
if (chain)
|
||||
chain->release();
|
||||
}
|
||||
@ -79,24 +79,24 @@ bool ConfObject::matches(Element* element, const char* type, const char* string)
|
||||
{
|
||||
if (element->name != type)
|
||||
return false;
|
||||
|
||||
|
||||
const Element *attribute = element->findAttribute (0);
|
||||
|
||||
|
||||
if (!attribute)
|
||||
return false;
|
||||
|
||||
//const char *name = configFile->translate (attribute->name, attribute->name);
|
||||
Firebird::string name = expand (attribute->name.c_str());
|
||||
|
||||
//const char *name = configFile->translate (attribute->name, attribute->name);
|
||||
const Firebird::string name = expand (attribute->name.c_str());
|
||||
numberStrings = 0;
|
||||
end = buffer + sizeof (buffer);
|
||||
next = buffer;
|
||||
|
||||
if (!match (0, name.c_str(), string))
|
||||
return false;
|
||||
|
||||
|
||||
object = element;
|
||||
source = string;
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -105,15 +105,15 @@ void ConfObject::putString(int position, const char* string, int stringLength)
|
||||
if (position >= MAX_STRINGS)
|
||||
throw AdminException("ConfObject: string segments overflow");
|
||||
|
||||
strings [position ] = next;
|
||||
|
||||
strings [position] = next;
|
||||
|
||||
if (next + stringLength + 1 >= end)
|
||||
throw AdminException ("ConfObject: string overflow");
|
||||
|
||||
|
||||
memcpy (next, string, stringLength);
|
||||
next [stringLength] = 0;
|
||||
next += stringLength + 1;
|
||||
|
||||
|
||||
if (position >= numberStrings)
|
||||
numberStrings = position + 1;
|
||||
}
|
||||
@ -160,21 +160,21 @@ bool ConfObject::match(int position, const char* pattern, const char* string)
|
||||
|
||||
if (c || *s)
|
||||
return false;
|
||||
|
||||
|
||||
putString (position, string, (int) strlen (string));
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
const char* ConfObject::getValue (const char* option, const char *defaultValue)
|
||||
{
|
||||
const Element *element = findAttribute (option);
|
||||
|
||||
|
||||
if (!element)
|
||||
return defaultValue;
|
||||
|
||||
|
||||
tempValue = expand (getValue (element));
|
||||
|
||||
|
||||
return tempValue.c_str();
|
||||
}
|
||||
|
||||
@ -182,38 +182,41 @@ const char* ConfObject::getValue (const char* option, const char *defaultValue)
|
||||
int ConfObject::getValue(const char* option, int defaultValue)
|
||||
{
|
||||
Element *element = findAttribute (option);
|
||||
|
||||
|
||||
if (!element)
|
||||
return defaultValue;
|
||||
|
||||
Firebird::string value (expand (getValue (element)));
|
||||
|
||||
const Firebird::string value (expand (getValue (element)));
|
||||
int n = 0;
|
||||
|
||||
|
||||
for (const char *p = value.c_str(); *p;)
|
||||
{
|
||||
char c = *p++;
|
||||
{
|
||||
const char c = *p++;
|
||||
if (c >= '0' && c <= '9')
|
||||
n = n * 10 + c - '0';
|
||||
else
|
||||
throw AdminException ("expected numeric value for option \"%s\", got \"%s\"", option, value.c_str());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return n;
|
||||
}
|
||||
|
||||
bool ConfObject::getValue(const char* option, bool defaultValue)
|
||||
{
|
||||
const Element *element = findAttribute (option);
|
||||
|
||||
|
||||
if (!element)
|
||||
return defaultValue;
|
||||
|
||||
Firebird::string value = expand (getValue (element));
|
||||
|
||||
|
||||
const Firebird::string value = expand (getValue (element));
|
||||
const char* valueName = value.c_str();
|
||||
|
||||
for (const BooleanName *name = booleanNames; name->string; ++name)
|
||||
if (strcasecmp (name->string, value.c_str()) == 0)
|
||||
{
|
||||
if (strcasecmp (name->string, valueName) == 0)
|
||||
return name->value;
|
||||
|
||||
}
|
||||
|
||||
throw AdminException ("expected boolean value for option \"%s\", got \"%s\"", option, value.c_str());
|
||||
}
|
||||
|
||||
@ -223,18 +226,21 @@ Firebird::string ConfObject::expand(const char* rawValue)
|
||||
return "";
|
||||
|
||||
char temp [1024];
|
||||
char *p = temp, *temp_end = temp + sizeof(temp) - 1;
|
||||
char *p = temp;
|
||||
const char* const temp_end = temp + sizeof(temp) - 1;
|
||||
bool changed = false;
|
||||
|
||||
|
||||
// FIX THIS: detect overflow instead of silenty truncating content, as it's done in ConfigFile::expand
|
||||
for (const char *s = rawValue; *s;)
|
||||
{
|
||||
{
|
||||
char c = *s++;
|
||||
if (c == '$')
|
||||
{
|
||||
{
|
||||
if (*s == '(')
|
||||
{
|
||||
{
|
||||
++s;
|
||||
char name [256], *n = name;
|
||||
char name [256];
|
||||
char* n = name;
|
||||
while (*s && (c = *s++) != ')' && n < name + sizeof(name) - 1)
|
||||
*n++ = c;
|
||||
*n = 0;
|
||||
@ -243,10 +249,10 @@ Firebird::string ConfObject::expand(const char* rawValue)
|
||||
throw AdminException ("can't substitute for \"%s\"", name);
|
||||
changed = true;
|
||||
for (const char *t = subst; *t && p < temp_end;)
|
||||
*p++ = *t++;
|
||||
}
|
||||
*p++ = *t++;
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
int n = 0;
|
||||
while (IS_DIGIT (*s))
|
||||
n = n * 10 + *s++ - '0';
|
||||
@ -254,76 +260,77 @@ Firebird::string ConfObject::expand(const char* rawValue)
|
||||
throw AdminException ("substitution index exceeds available segments");
|
||||
for (const char *t = (n == 0) ? source.c_str() : strings [n - 1]; *t && p < temp_end;)
|
||||
*p++ = *t++;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (p < temp_end)
|
||||
*p++ = c;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
*p = 0;
|
||||
|
||||
|
||||
if (!changed)
|
||||
return temp;
|
||||
|
||||
return PathName::expandFilename (temp);
|
||||
return PathName::expandFilename (temp);
|
||||
}
|
||||
|
||||
Firebird::string ConfObject::getValue(const char* attributeName)
|
||||
{
|
||||
const Element *attribute = findAttribute (attributeName);
|
||||
|
||||
|
||||
if (!attribute)
|
||||
return "";
|
||||
|
||||
|
||||
return expand (getValue (attribute));
|
||||
}
|
||||
|
||||
const char* ConfObject::getValue(int instanceNumber, const char* attributeName)
|
||||
{
|
||||
const Element *attribute = findAttribute (attributeName);
|
||||
|
||||
|
||||
if (!attribute)
|
||||
return "";
|
||||
|
||||
|
||||
const Element *val = attribute->findAttribute (instanceNumber);
|
||||
|
||||
|
||||
if (!val)
|
||||
return "";
|
||||
|
||||
|
||||
tempValue = expand (val->name.c_str());
|
||||
|
||||
|
||||
return tempValue.c_str();
|
||||
}
|
||||
|
||||
const char* ConfObject::getConcatenatedValues(const char* attributeName)
|
||||
{
|
||||
const Element *attribute = findAttribute (attributeName);
|
||||
Firebird::string value;
|
||||
|
||||
|
||||
if (!attribute)
|
||||
return value.c_str();
|
||||
|
||||
return "";
|
||||
|
||||
Firebird::string value;
|
||||
|
||||
for (const Element *att = attribute->getAttributes(); att; att = att->sibling)
|
||||
{
|
||||
{
|
||||
if (value.hasData())
|
||||
value += " ";
|
||||
value += att->name;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
tempValue = value;
|
||||
|
||||
|
||||
return tempValue.c_str();
|
||||
}
|
||||
|
||||
Element* ConfObject::findAttribute(const char* attributeName)
|
||||
{
|
||||
if (object)
|
||||
{
|
||||
{
|
||||
Element *element = object->findChild (attributeName);
|
||||
if (element)
|
||||
return element;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (chain)
|
||||
return chain->findAttribute (attributeName);
|
||||
|
||||
@ -339,7 +346,7 @@ void ConfObject::setChain(ConfObject* obj)
|
||||
{
|
||||
if (chain)
|
||||
chain->release();
|
||||
|
||||
|
||||
if (chain = obj)
|
||||
chain->addRef();
|
||||
}
|
||||
@ -348,12 +355,12 @@ const char* ConfObject::getValue(const Element* attribute)
|
||||
{
|
||||
if (!attribute)
|
||||
return NULL;
|
||||
|
||||
|
||||
const Element *value = attribute->findAttribute (0);
|
||||
|
||||
|
||||
if (!value)
|
||||
return NULL;
|
||||
|
||||
|
||||
return value->name.c_str();
|
||||
}
|
||||
|
||||
@ -363,10 +370,10 @@ const char* ConfObject::getName()
|
||||
return NULL;
|
||||
|
||||
const Element *attribute = object->findAttribute (0);
|
||||
|
||||
|
||||
if (!attribute)
|
||||
return NULL;
|
||||
|
||||
|
||||
return attribute->name.c_str();
|
||||
}
|
||||
|
||||
|
||||
@ -30,8 +30,6 @@
|
||||
#include "../common/classes/fb_string.h"
|
||||
#include "RefObject.h"
|
||||
|
||||
const static int MAX_STRINGS = 32;
|
||||
|
||||
START_NAMESPACE
|
||||
|
||||
class Element;
|
||||
@ -64,18 +62,19 @@ protected:
|
||||
virtual const char* getValue(const Element* attribute);
|
||||
|
||||
public:
|
||||
Element *object;
|
||||
Element* object;
|
||||
|
||||
private:
|
||||
ConfObject *chain;
|
||||
ConfigFile *configFile;
|
||||
enum { MAX_STRINGS = 32 };
|
||||
ConfObject* chain;
|
||||
ConfigFile* configFile;
|
||||
Firebird::string source;
|
||||
Firebird::string tempValue;
|
||||
int numberStrings;
|
||||
const char *strings [MAX_STRINGS];
|
||||
char buffer [1024];
|
||||
char *next;
|
||||
char *end;
|
||||
int numberStrings;
|
||||
const char* strings [MAX_STRINGS];
|
||||
char buffer [1024];
|
||||
char* next;
|
||||
const char* end;
|
||||
};
|
||||
|
||||
END_NAMESPACE
|
||||
|
||||
Loading…
Reference in New Issue
Block a user