Merge branch 'develop'

Author: salcock

ChangeLog

@@ -1,3 +1,7 @@
+Version 4.1.2
+=============
+ * Fix buffer overflow bug in the swift reading code (thanks Alistair).
+
 Version 4.1.1
 =============
  * Fix bad version numbering of installed libwandder.so

README

@@ -1,4 +1,4 @@
-WANDIO 4.1.1
+WANDIO 4.1.2
 
 ---------------------------------------------------------------------------
 Copyright (c) 2007-2019 The University of Waikato, Hamilton, New Zealand.

configure.ac

@@ -3,11 +3,11 @@
 # Now you only need to update the version number in two places - below,
 # and in the README
 
-AC_INIT([wandio],[4.1.1],[contact@wand.net.nz],[wandio])
+AC_INIT([wandio],[4.1.2],[contact@wand.net.nz],[wandio])
 
 WANDIO_MAJOR=4
 WANDIO_MID=1
-WANDIO_MINOR=1
+WANDIO_MINOR=2
 
 # OpenSolaris hides libraries like libncurses in /usr/gnu/lib, which is not
 # searched by default - add it to LDFLAGS so we at least have a chance of

debian/changelog

@@ -1,3 +1,9 @@
+libwandio1 (4.1.2-1) unstable; urgency=medium
+
+  * Fix swift buffer overflow bug
+
+ -- Shane Alcock <salcock@waikato.ac.nz>  Wed, 06 Mar 2019 13:07:02 +1300
+
 libwandio1 (4.1.1-1) unstable; urgency=medium
 
   * Fix bad version number for installed .so

lib/Makefile.am

@@ -73,5 +73,5 @@ libwandio_la_SOURCES=wandio.c ior-peek.c ior-stdio.c ior-thread.c \
 
 AM_CPPFLAGS = @ADD_INCLS@
 libwandio_la_LIBADD = @LIBWANDIO_LIBS@
-libwandio_la_LDFLAGS=-version-info 5:1:1 @ADD_LDFLAGS@
+libwandio_la_LDFLAGS=-version-info 5:2:1 @ADD_LDFLAGS@
 

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++;
     }

rpm/libwandio1.spec

@@ -1,5 +1,5 @@
 Name:           libwandio1
-Version:        4.1.0
+Version:        4.1.2
 Release:        1%{?dist}
 Summary:        C Multi-Threaded File Compression and Decompression Library