osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

fix logging: out-of-bounds check should end with user categories 

To check category bounds, rather use num_cat_user, to redirect all semantically
unknown categories to DLGLOBAL.

Adjust logging_test expectations accordingly: "(d)" is now also shown.

Note: subsys is and needs to be signed, while num_cat* are unsigned. Thus for a
negative subsys, 'subsys >= num_cat_user' practically always yields true. Pay
close attention to signedness and check upper bound only for positive values.

Change-Id: I4a952b759f30d90fbfb81fedcfc56a8092ea18c1
This commit is contained in:
Neels Hofmeyr 2016-12-12 16:00:24 +01:00
parent d1a145e5e7
commit 748022694c
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/logging.c
View File

@ -336,6 +336,11 @@ err:
* which should never happen unless even the DLGLOBAL category is missing. */
static inline int map_subsys(int subsys)
{
/* Note: comparing signed and unsigned integers */
if (subsys > 0 && ((unsigned int)subsys) >= osmo_log_info->num_cat_user)
subsys = DLGLOBAL;
if (subsys < 0)
subsys = subsys_lib2index(subsys);

1
tests/logging/logging_test.err
View File

@ -4,4 +4,5 @@ DRLL You should see this
DLGLOBAL You should see this on DLGLOBAL (a)
DLGLOBAL You should see this on DLGLOBAL (b)
DLGLOBAL You should see this on DLGLOBAL (c)
DLGLOBAL You should see this on DLGLOBAL (d)
DLGLOBAL You should see this on DLGLOBAL (e)