]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
app_voicemail_odbc: Fix string overflow warning.
authorNaveen Albert <asterisk@phreaknet.org>
Mon, 14 Nov 2022 13:12:19 +0000 (13:12 +0000)
committerGeorge Joseph <gjoseph@digium.com>
Tue, 20 Dec 2022 14:57:17 +0000 (08:57 -0600)
Fixes a negative offset warning by initializing
the buffer to empty.

Additionally, although it doesn't currently complain
about it, the size of a buffer is increased to
accomodate the maximum size contents it could have.

ASTERISK-30240 #close

Change-Id: I8eecedf14d3f2a75864797f802277cac89a32877

apps/app_voicemail.c

index 1aca59b766347df61f05de8db223e502f35a1299..88dc342ee13d9fbce0c6aa384912bd62df1f0b1c 100644 (file)
@@ -4484,15 +4484,16 @@ static void rename_file(char *sdir, int smsg, char *mailboxuser, char *mailboxco
  */
 static int remove_file(char *dir, int msgnum)
 {
-       char fn[PATH_MAX];
-       char full_fn[PATH_MAX];
+       char fn[PATH_MAX] = "";
+       char full_fn[PATH_MAX + 4]; /* Plus .txt */
        char msgnums[80];
 
        if (msgnum > -1) {
                snprintf(msgnums, sizeof(msgnums), "%d", msgnum);
                make_file(fn, sizeof(fn), dir, msgnum);
-       } else
+       } else {
                ast_copy_string(fn, dir, sizeof(fn));
+       }
        ast_filedelete(fn, NULL);
        snprintf(full_fn, sizeof(full_fn), "%s.txt", fn);
        unlink(full_fn);