Use common is_ctrl_char() helper function

This modifies couple of code segments that replaced control characters
in strings with '_' to use a common helper function.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/src/p2p/p2p_parse.c b/src/p2p/p2p_parse.c
index 44b00984c3516461f020ba8b4d6af6984b6e0fa9..def41ff51d37197100e62456d080ce1bca84c759 100644 (file)
--- a/src/p2p/p2p_parse.c
+++ b/src/p2p/p2p_parse.c
@@ -161,8 +161,7 @@ static int p2p_parse_attribute(u8 id, const u8 *data, u16 len,
                for (i = 0; i < nlen; i++) {
                        if (msg->device_name[i] == '\0')
                                break;
-                       if (msg->device_name[i] > 0 &&
-                           msg->device_name[i] < 32)
+                       if (is_ctrl_char(msg->device_name[i]))
                                msg->device_name[i] = '_';
                }
                wpa_printf(MSG_DEBUG, "P2P: * Device Info: addr " MACSTR
@@ -743,7 +742,7 @@ static int p2p_group_info_text(const u8 *gi, size_t gi_len, char *buf,
                name[cli->dev_name_len] = '\0';
                count = (int) cli->dev_name_len - 1;
                while (count >= 0) {
-                       if (name[count] > 0 && name[count] < 32)
+                       if (is_ctrl_char(name[count]))
                                name[count] = '_';
                        count--;
                }

diff --git a/src/utils/common.c b/src/utils/common.c
index c31717c773ff94ea91cda10edfb2ec64d71e489a..5cf0d571bb0d87d1ef10e554a44888a76c268b09 100644 (file)
--- a/src/utils/common.c
+++ b/src/utils/common.c
@@ -1088,3 +1088,9 @@ size_t utf8_escape(const char *inp, size_t in_size,
 
        return res_size;
 }
+
+
+int is_ctrl_char(char c)
+{
+       return c > 0 && c < 32;
+}

diff --git a/src/utils/common.h b/src/utils/common.h
index a0eda4a2c48bb8054f0a8a96e814d46581aae6e8..88318f5d255a71e20f358b940b5122297b63e1ae 100644 (file)
--- a/src/utils/common.h
+++ b/src/utils/common.h
@@ -554,6 +554,7 @@ size_t utf8_escape(const char *inp, size_t in_size,
                   char *outp, size_t out_size);
 size_t utf8_unescape(const char *inp, size_t in_size,
                     char *outp, size_t out_size);
+int is_ctrl_char(char c);
 
 
 /*

diff --git a/src/wps/wps.c b/src/wps/wps.c
index 2c68be8c62ea05394ca4b8ee2f5746261439dccd..498f11f050afc7bbc2d25eacde017e908f145ef4 100644 (file)
--- a/src/wps/wps.c
+++ b/src/wps/wps.c
@@ -618,7 +618,8 @@ int wps_attr_text(struct wpabuf *data, char *buf, char *end)
                if (str == NULL)
                        return pos - buf;
                for (i = 0; i < attr.dev_name_len; i++) {
-                       if (attr.dev_name[i] < 32)
+                       if (attr.dev_name[i] == 0 ||
+                           is_ctrl_char(attr.dev_name[i]))
                                str[i] = '_';
                        else
                                str[i] = attr.dev_name[i];