diff options
author | unknown <msvensson@neptunus.(none)> | 2005-05-19 20:38:48 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2005-05-19 20:38:48 +0200 |
commit | 384456fc10c124d767e2d94bba4f59d8afc9ee4f (patch) | |
tree | 6ceb697d9663c57ba7137b9a23006ada29920e9e /ndb/src | |
parent | 3bd46ad8d2b05a11f9f24a5108b2077a7bb406a6 (diff) | |
download | mariadb-git-384456fc10c124d767e2d94bba4f59d8afc9ee4f.tar.gz |
BUG#9626 valgrind warnings
- after review fixes
mysql-test/r/ndb_basic.result:
Test using table with long name
mysql-test/t/ndb_basic.test:
Test using table with long name
ndb/include/transporter/TransporterDefinitions.hpp:
Define constant for max section size
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Add check for not sending too long table name to ndb kernel
Diffstat (limited to 'ndb/src')
-rw-r--r-- | ndb/src/ndbapi/NdbDictionaryImpl.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/ndb/src/ndbapi/NdbDictionaryImpl.cpp index a4e96440cd1..fe2df815f1f 100644 --- a/ndb/src/ndbapi/NdbDictionaryImpl.cpp +++ b/ndb/src/ndbapi/NdbDictionaryImpl.cpp @@ -1088,6 +1088,7 @@ NdbDictInterface::getTable(int tableId, bool fullyQualifiedNames) Send GET_TABINFOREQ signal with the table name in the first long section part */ + NdbTableImpl * NdbDictInterface::getTable(const char * name, bool fullyQualifiedNames) { @@ -1095,12 +1096,16 @@ NdbDictInterface::getTable(const char * name, bool fullyQualifiedNames) GetTabInfoReq* const req = CAST_PTR(GetTabInfoReq, tSignal.getDataPtrSend()); const Uint32 str_len= strlen(name) + 1; // NULL terminated + const Uint32 str_len_words= (str_len + 3) / 4; // Size in words - /* Note! It might be a good idea to check that the length of - table name does not exceed the max size of a long signal */ + if (str_len > MAX_SECTION_SIZE) + { + m_error.code= 4307; + return 0; + } m_namebuf.clear(); - m_namebuf.grow(str_len+(4-str_len%4)); // Round up to word size + m_namebuf.grow(str_len_words*4); // Word size aligned number of bytes m_namebuf.append(name, str_len); req->senderRef= m_reference; @@ -1114,7 +1119,7 @@ NdbDictInterface::getTable(const char * name, bool fullyQualifiedNames) LinearSectionPtr ptr[1]; ptr[0].p= (Uint32*)m_namebuf.get_data(); - ptr[0].sz= (str_len + 3)/ 4; // Size in words + ptr[0].sz= str_len_words; return getTable(&tSignal, ptr, 1, fullyQualifiedNames); } |