sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-19 13:44:20 +03:00
Code Activity

init_valid_table: Fix a memory leak that would lose the

Browse Source 
dynamically-created valid table every time the configuration was
reloaded.
(This used to be commit e42b237d98)
This commit is contained in:
Martin Pool
2003-02-26 06:19:16 +00:00
parent b906a9df75
commit f7bb698298
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source3/lib/util_unistr.c
View File

@@ -105,27 +105,34 @@ static int check_dos_char(smb_ucs2_t c)
**/ **/
void init_valid_table(void) void init_valid_table(void)
{ {
static int initialised;
static int mapped_file; static int mapped_file;
int i; int i;
const char *allowed = ".!#$%&'()_-@^`~"; const char *allowed = ".!#$%&'()_-@^`~";
uint8 *valid_file;
if (initialised && mapped_file) return; if (mapped_file) {
initialised = 1; /* Can't unmap files, so stick with what we have */
return;
}
valid_table = map_file(lib_path("valid.dat"), 0x10000); valid_file = map_file(lib_path("valid.dat"), 0x10000);
if (valid_table) { if (valid_file) {
valid_table = valid_file;
mapped_file = 1; mapped_file = 1;
return; return;
} }
/* Otherwise, using a dynamically loaded one. */ /* Otherwise, we're using a dynamically created valid_table.
* It might need to be regenerated if the code page changed.
* We know that we're not using a mapped file, so we can
* free() the old one. */
if (valid_table) free(valid_table); if (valid_table) free(valid_table);
DEBUG(2,("creating default valid table\n")); DEBUG(2,("creating default valid table\n"));
valid_table = malloc(0x10000); valid_table = malloc(0x10000);
for (i=0;i<128;i++) valid_table[i] = isalnum(i) || for (i=0;i<128;i++)
strchr(allowed,i); valid_table[i] = isalnum(i) || strchr(allowed,i);
for (;i<0x10000;i++) { for (;i<0x10000;i++) {
smb_ucs2_t c; smb_ucs2_t c;
SSVAL(&c, 0, i); SSVAL(&c, 0, i);