Skip to content

Commit e90031b

Browse files
committed
Merge branch 'release/1.2.1'
2 parents cc43d97 + 491fd2b commit e90031b

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

asterisk/app_numformat.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ static int format_num_func_read(struct ast_channel *chan, const char *cmd, char
302302
country++;
303303
}
304304

305-
if ((option = strchr(country, ':'))) {
305+
if (country && (option = strchr(country, ':'))) {
306306
*option = '\0';
307307
option++;
308308
}
@@ -347,7 +347,7 @@ static int valid_num_func_read(struct ast_channel *chan, const char *cmd, char *
347347
country++;
348348
}
349349

350-
if ((option = strchr(country, ':'))) {
350+
if (country && (option = strchr(country, ':'))) {
351351
*option = '\0';
352352
option++;
353353
}
@@ -385,7 +385,7 @@ static int info_num_func_read(struct ast_channel *chan, const char *cmd, char *d
385385
country++;
386386
}
387387

388-
if ((option = strchr(country, ':'))) {
388+
if (country && (option = strchr(country, ':'))) {
389389
*option = '\0';
390390
option++;
391391
}

debian/changelog

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
libastphonenumber (1.2.1) all; urgency=medium
2+
3+
* Bugfix: Segfault when using NUM_INFO without all required arguments
4+
5+
-- Sebastien De Fauw <sdefauw@gmail.com> Mon, 23 Sep 2019 16:04:25 +0200
6+
17
libastphonenumber (1.2.0) all; urgency=medium
28

39
* Improvment: Remove some char when for some formatting

0 commit comments

Comments
 (0)