Merge branch 'alistairking-fix-swift' into develop

LibtraceTeam · Mar 5, 2019 · d4d310a · d4d310a
2 parents 5ecf42f + 2fc4aa1
commit d4d310a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/swift-support/keystone.c b/lib/swift-support/keystone.c
@@ -85,15 +85,15 @@ static size_t auth_header_cb(char *buf, size_t size, size_t nmemb, void *data) {
   keystone_auth_token_t *token = (keystone_auth_token_t *)data;
   size_t buflen = size * nmemb;
   char *p;
-  int chomplen = 0;
+  size_t chomplen = 0;
   int token_len = 0;
 
   if (buflen > strlen(TOKEN_HDR) &&
       strncmp(buf, TOKEN_HDR, strlen(TOKEN_HDR)) == 0) {
     // figure out how much trailing garbage there is (e.g., newline)
     // apparently it is possible that there will be none
-    p = buf + buflen;
-    while (*p == '\0' || *p == '\n' || *p == '\r') {
+    p = buf + buflen - 1;
+    while ((chomplen < buflen) && (*p == '\0' || *p == '\n' || *p == '\r')) {
       p--;
       chomplen++;
     }

diff --git a/rpm/libwandio1.spec b/rpm/libwandio1.spec
@@ -1,5 +1,5 @@
 Name:           libwandio1
-Version:        4.1.0
+Version:        4.1.1
 Release:        1%{?dist}
 Summary:        C Multi-Threaded File Compression and Decompression Library