From 57ee79a5630032a080aa59f49122dadc2faca6e3 Mon Sep 17 00:00:00 2001
From: Alexander Traud <pabstraud@compuserve.com>
Date: Thu, 29 Oct 2020 09:55:53 +0100
Subject: [PATCH] Compiler fixes for GCC with -Og

ASTERISK-29144

Change-Id: I2a72c072083b4492a223c6f9d73d21f4f424db62
---
 addons/ooh323c/src/ooq931.c | 2 +-
 apps/app_directory.c        | 2 +-
 apps/app_voicemail.c        | 2 +-
 channels/chan_audiosocket.c | 2 +-
 funcs/func_odbc.c           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/ooh323c/src/ooq931.c b/addons/ooh323c/src/ooq931.c
index 01a8e4aaf3..fc18703921 100644
--- a/addons/ooh323c/src/ooq931.c
+++ b/addons/ooh323c/src/ooq931.c
@@ -585,7 +585,7 @@ int ooDecodeUUIE(OOCTXT* pctxt, Q931Message *q931Msg)
    unsigned int i;
    ASN1BOOL aligned=TRUE;
    int stat;
-   Q931InformationElement *ie;
+   Q931InformationElement *ie=NULL;
    /* OOCTXT *pctxt = &gH323ep.msgctxt; */
    if(q931Msg ==NULL)
    {
diff --git a/apps/app_directory.c b/apps/app_directory.c
index a47fe3b661..36da702a5e 100644
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -396,7 +396,7 @@ static int select_item_menu(struct ast_channel *chan, struct directory_item **it
 {
 	struct directory_item **block, *item;
 	int i, limit, res = 0;
-	char buf[9];
+	char buf[7+12]; /* INT_MIN has a length of 12 chars */
 
 	/* option p(n): cellphone pause option */
 	select_item_pause(chan, flags, opts);
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index bbbd6fa1e8..c830ec3c60 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -11198,7 +11198,7 @@ static int vm_authenticate(struct ast_channel *chan, char *mailbox, int mailbox_
 			int skipuser, int max_logins, int silent)
 {
 	int useadsi = 0, valid = 0, logretries = 0;
-	char password[AST_MAX_EXTENSION], *passptr;
+	char password[AST_MAX_EXTENSION], *passptr = NULL;
 	struct ast_vm_user vmus, *vmu = NULL;
 
 	/* If ADSI is supported, setup login screen */
diff --git a/channels/chan_audiosocket.c b/channels/chan_audiosocket.c
index 52f208ce0a..1c9c0fb656 100644
--- a/channels/chan_audiosocket.c
+++ b/channels/chan_audiosocket.c
@@ -147,7 +147,7 @@ static struct ast_channel *audiosocket_request(const char *type,
 	struct ast_format_cap *caps = NULL;
 	struct ast_format *fmt = NULL;
 	uuid_t uu;
-	int fd;
+	int fd = -1;
 	AST_DECLARE_APP_ARGS(args,
 		AST_APP_ARG(destination);
 		AST_APP_ARG(idStr);
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index e9fe597dec..acebdcc51a 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -1181,7 +1181,7 @@ static int free_acf_query(struct acf_odbc_query *query)
 static int init_acf_query(struct ast_config *cfg, char *catg, struct acf_odbc_query **query)
 {
 	const char *tmp;
-	const char *tmp2;
+	const char *tmp2 = NULL;
 	int i;
 
 	if (!cfg || !catg) {