Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1142?usp=email
to look at the new patch set (#6).
Change subject: buffer: Clarify usage of char_class
......................................................................
buffer: Clarify usage of char_class
Silence compiler warnings due to conversion from
char to unsigned char. In this case we actually
depend on this conversion.
Change-Id: I73bc163d48b2d6a954cd231961826f33143fcd12
Signed-off-by: Frank Lichtenheld <[email protected]>
---
M src/openvpn/buffer.c
1 file changed, 15 insertions(+), 2 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/42/1142/6
diff --git a/src/openvpn/buffer.c b/src/openvpn/buffer.c
index 26f18dd..f10e7c2 100644
--- a/src/openvpn/buffer.c
+++ b/src/openvpn/buffer.c
@@ -545,6 +545,10 @@
buf_write_u8(buf, 0);
}
+#if defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+
/*
* Remove trailing \r and \n chars and ensure
* null termination.
@@ -559,7 +563,7 @@
{
break;
}
- if (char_class(*last, CC_CRLF | CC_NULL))
+ if (char_class((unsigned char)*last, CC_CRLF | CC_NULL))
{
if (!buf_inc_len(buf, -1))
{
@@ -876,6 +880,14 @@
* Classify and mutate strings based on character types.
*/
+/* Note 1: This functions depends on getting an unsigned
+ char. Both the is*() functions and our own checks expect it
+ this way.
+ Note 2: For CC_PRINT we just accept everything >= 32, so
+ if we ingest non-ASCII UTF-8 we will classify it as
+ printable since it will be >= 128. Other encodings are
+ not officially supported.
+*/
bool
char_class(const unsigned char c, const unsigned int flags)
{
@@ -1019,7 +1031,8 @@
static inline bool
char_inc_exc(const char c, const unsigned int inclusive, const unsigned int
exclusive)
{
- return char_class(c, inclusive) && !char_class(c, exclusive);
+ return char_class((unsigned char)c, inclusive)
+ && !char_class((unsigned char)c, exclusive);
}
bool
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1142?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I73bc163d48b2d6a954cd231961826f33143fcd12
Gerrit-Change-Number: 1142
Gerrit-PatchSet: 6
Gerrit-Owner: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
