Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-12-24 13:33:24 +01:00
Code Issues Projects Releases Wiki Activity

fix issue where log file cannot be created due to invalid name/path

Browse Source
This commit is contained in:
Jfreegman 2014-04-12 03:39:15 -04:00
parent a29136d6b7
commit 5b3acf3f6b
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/log.c
View File

@ -42,6 +42,9 @@ void init_logging_session(uint8_t *name, uint8_t *key, struct chatlog *log)
if (!log->log_on) if (!log->log_on)
return; return;
if (!valid_nick(name))
name = UNKNOWN_NAME;
char *user_config_dir = get_user_config_dir(); char *user_config_dir = get_user_config_dir();
int path_len = strlen(user_config_dir) + strlen(CONFIGDIR) + strlen(name); int path_len = strlen(user_config_dir) + strlen(CONFIGDIR) + strlen(name);

3
src/misc_tools.c
View File

@ -202,6 +202,7 @@ int qsort_strcasecmp_hlpr(const void *nick1, const void *nick2)
/* Returns 1 if nick is valid, 0 if not. A valid toxic nick: /* Returns 1 if nick is valid, 0 if not. A valid toxic nick:
- cannot be empty - cannot be empty
- cannot start with a space - cannot start with a space
- must not contain a forward slash (for logfile naming purposes)
- must not contain contiguous spaces */ - must not contain contiguous spaces */
int valid_nick(uint8_t *nick) int valid_nick(uint8_t *nick)
{ {
@ -213,6 +214,8 @@ int valid_nick(uint8_t *nick)
for (i = 0; nick[i]; ++i) { for (i = 0; nick[i]; ++i) {
if (nick[i] == ' ' && nick[i+1] == ' ') if (nick[i] == ' ' && nick[i+1] == ' ')
return 0; return 0;
if (nick[i] == '/')
return 0;
} }
return 1; return 1;