Changeset - r23692:4ce63b2a7fe5
Parent rev.
Child rev.
[Not reviewed]
master
0 3 0
glx22 - 6 years ago 2019-05-01 17:12:37
glx22@users.noreply.github.com
Fix #7553: check bounds when loading strings (#7554)
3 files changed with 23 insertions and 17 deletions:
src/stdafx.h
8
6
src/strgen/strgen.h
5
5
src/strgen/strgen_base.cpp
10
6
0 comments (0 inline, 0 general)
src/stdafx.h
➞
Show inline comments
 
@@ -284,13 +284,15 @@
 

			




	
	
	
		
 
/* MSVCRT of course has to have a different syntax for long long *sigh* */

			




	
	
	
		
 
#if defined(_MSC_VER) || defined(__MINGW32__)

			




	
	
	
		
 
	#define OTTD_PRINTF64 "%I64d"

			




	
	
	
		
 
	#define OTTD_PRINTFHEX64 "%I64x"

			




	
	
	
		
 
	#define PRINTF_SIZE "%Iu"

			




	
	
	
		
 
#   define OTTD_PRINTF64 "%I64d"

			




	
	
	
		
 
#   define OTTD_PRINTFHEX64 "%I64x"

			




	
	
	
		
 
#   define PRINTF_SIZE "%Iu"

			




	
	
	
		
 
#   define PRINTF_SIZEX "%IX"

			




	
	
	
		
 
#else

			




	
	
	
		
 
	#define OTTD_PRINTF64 "%lld"

			




	
	
	
		
 
	#define OTTD_PRINTFHEX64 "%llx"

			




	
	
	
		
 
	#define PRINTF_SIZE "%zu"

			




	
	
	
		
 
#   define OTTD_PRINTF64 "%lld"

			




	
	
	
		
 
#   define OTTD_PRINTFHEX64 "%llx"

			




	
	
	
		
 
#   define PRINTF_SIZE "%zu"

			




	
	
	
		
 
#   define PRINTF_SIZEX "%zX"

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
typedef unsigned char byte;

			




        

    


    
    

    

        

                

                    src/strgen/strgen.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -29,12 +29,12 @@ struct LangString {

			




	
	
	
		
 
	char *name;            ///< Name of the string.

			




	
	
	
		
 
	char *english;         ///< English text.

			




	
	
	
		
 
	char *translated;      ///< Translated text.

			




	
	
	
		
 
	uint16 hash_next;      ///< Next hash entry.

			




	
	
	
		
 
	uint16 index;          ///< The index in the language file.

			




	
	
	
		
 
	size_t hash_next;      ///< Next hash entry.

			




	
	
	
		
 
	size_t index;          ///< The index in the language file.

			




	
	
	
		
 
	int line;              ///< Line of string in source-file.

			




	
	
	
		
 
	Case *translated_case; ///< Cases of the translation.

			




	
	
	
		
 

			




	
	
	
		
 
	LangString(const char *name, const char *english, int index, int line);

			




	
	
	
		
 
	LangString(const char *name, const char *english, size_t index, int line);

			




	
	
	
		
 
	~LangString();

			




	
	
	
		
 
	void FreeTranslation();

			




	
	
	
		
 
};

			




	
	
		
 
@@ -42,10 +42,10 @@ struct LangString {

			




	
	
	
		
 
/** Information about the currently known strings. */

			




	
	
	
		
 
struct StringData {

			




	
	
	
		
 
	LangString **strings; ///< Array of all known strings.

			




	
	
	
		
 
	uint16 *hash_heads;   ///< Hash table for the strings.

			




	
	
	
		
 
	size_t *hash_heads;   ///< Hash table for the strings.

			




	
	
	
		
 
	size_t tabs;          ///< The number of 'tabs' of strings.

			




	
	
	
		
 
	size_t max_strings;   ///< The maximum number of strings.

			




	
	
	
		
 
	int next_string_id;   ///< The next string ID to allocate.

			




	
	
	
		
 
	size_t next_string_id;///< The next string ID to allocate.

			




	
	
	
		
 

			




	
	
	
		
 
	StringData(size_t tabs);

			




	
	
	
		
 
	~StringData();

			




        

    


    
    

    

        

                

                    src/strgen/strgen_base.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -58,7 +58,7 @@ Case::~Case()

			




	
	
	
		
 
 * @param index   The index in the string table.

			




	
	
	
		
 
 * @param line    The line this string was found on.

			




	
	
	
		
 
 */

			




	
	
	
		
 
LangString::LangString(const char *name, const char *english, int index, int line) :

			




	
	
	
		
 
LangString::LangString(const char *name, const char *english, size_t index, int line) :

			




	
	
	
		
 
		name(stredup(name)), english(stredup(english)), translated(nullptr),

			




	
	
	
		
 
		hash_next(0), index(index), line(line), translated_case(nullptr)

			




	
	
	
		
 
{

			




	
	
		
 
@@ -90,7 +90,7 @@ void LangString::FreeTranslation()

			




	
	
	
		
 
StringData::StringData(size_t tabs) : tabs(tabs), max_strings(tabs * TAB_SIZE)

			




	
	
	
		
 
{

			




	
	
	
		
 
	this->strings = CallocT<LangString *>(max_strings);

			




	
	
	
		
 
	this->hash_heads = CallocT<uint16>(max_strings);

			




	
	
	
		
 
	this->hash_heads = CallocT<size_t>(max_strings);

			




	
	
	
		
 
	this->next_string_id = 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
		
 
@@ -144,9 +144,9 @@ void StringData::Add(const char *s, Lang

			




	
	
	
		
 
 */

			




	
	
	
		
 
LangString *StringData::Find(const char *s)

			




	
	
	
		
 
{

			




	
	
	
		
 
	int idx = this->hash_heads[this->HashStr(s)];

			




	
	
	
		
 
	size_t idx = this->hash_heads[this->HashStr(s)];

			




	
	
	
		
 

			




	
	
	
		
 
	while (--idx >= 0) {

			




	
	
	
		
 
	while (idx-- > 0) {

			




	
	
	
		
 
		LangString *ls = this->strings[idx];

			




	
	
	
		
 

			




	
	
	
		
 
		if (strcmp(ls->name, s) == 0) return ls;

			




	
	
		
 
@@ -764,7 +764,7 @@ void StringReader::HandleString(char *st

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
	
		
 
		if (this->data.strings[this->data.next_string_id] != nullptr) {

			




	
	
	
		
 
			strgen_error("String ID 0x%X for '%s' already in use by '%s'", this->data.next_string_id, str, this->data.strings[this->data.next_string_id]->name);

			




	
	
	
		
 
			strgen_error("String ID 0x" PRINTF_SIZEX " for '%s' already in use by '%s'", this->data.next_string_id, str, this->data.strings[this->data.next_string_id]->name);

			




	
	
	
		
 
			return;

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




	
	
		
 
@@ -830,11 +830,15 @@ void StringReader::ParseFile()

			




	
	
	
		
 
	strecpy(_lang.digit_decimal_separator, ".", lastof(_lang.digit_decimal_separator));

			




	
	
	
		
 

			




	
	
	
		
 
	_cur_line = 1;

			




	
	
	
		
 
	while (this->ReadLine(buf, lastof(buf)) != nullptr) {

			




	
	
	
		
 
	while (this->data.next_string_id < this->data.max_strings && this->ReadLine(buf, lastof(buf)) != nullptr) {

			




	
	
	
		
 
		rstrip(buf);

			




	
	
	
		
 
		this->HandleString(buf);

			




	
	
	
		
 
		_cur_line++;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	if (this->data.next_string_id == this->data.max_strings) {

			




	
	
	
		
 
		strgen_error("Too many strings, maximum allowed is " PRINTF_SIZE, this->data.max_strings);

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: code.theleruby.com-48
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2022 by various authors & licensed under GPLv3.
            – Support