bbs/magicka
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a couple of bugs, one in stralloc and one uninitialized ptr vector

Browse Source
This commit is contained in:
Andrew Pamment 2018-10-11 15:25:00 +10:00
parent 6d30116ed9
commit 15d09ed57a
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mail_menu.c
View File

@ -1454,6 +1454,8 @@ int read_message(struct user_record *user, struct msg_headers *msghs, int mailno
uuid_t magi_msgid; uuid_t magi_msgid;
struct ptr_vector msg_lines; struct ptr_vector msg_lines;
init_ptr_vector(&msg_lines);
jb = open_jam_base(conf.mail_conferences[user->cur_mail_conf]->mail_areas[user->cur_mail_area]->path); jb = open_jam_base(conf.mail_conferences[user->cur_mail_conf]->mail_areas[user->cur_mail_area]->path);
if (!jb) { if (!jb) {
dolog("Error opening JAM base.. %s", conf.mail_conferences[user->cur_mail_conf]->mail_areas[user->cur_mail_area]->path); dolog("Error opening JAM base.. %s", conf.mail_conferences[user->cur_mail_conf]->mail_areas[user->cur_mail_area]->path);

2
src/stralloc/stralloc.c
View File

@ -16,7 +16,7 @@ int stralloc_ready(stralloc *sa, size_t n) {
sa->s = malloc(n); sa->s = malloc(n);
return sa != NULL; return sa != NULL;
} }
if (sa->a <= n) if (sa->a >= n)
return 1; return 1;
na = 30 + n + (n >> 3); na = 30 + n + (n >> 3);
ns = realloc(sa->s, na); ns = realloc(sa->s, na);