Browse Source

api: Bugfix, bump version to 4.1.271, initialise name/desc/algo in addpool() so checks for NULL work.

Otherwise API "addpool|a,b,c" command segfaults (access uninitialised
memory address).
refactor
Noel Maersk 11 years ago
parent
commit
f5709910fb
  1. 2
      NEWS.md
  2. 2
      api.c
  3. 2
      configure.ac
  4. 6
      winbuild/dist/include/config.h

2
NEWS.md

@ -5,7 +5,7 @@
* *
## Version 4.1.270 - 12th April 2014 ## Version 4.1.271 - 12th April 2014
* Allow setting algorithm per-pool and initial implementation of kernel * Allow setting algorithm per-pool and initial implementation of kernel
hot-swapping (by _mrbrdo_). Use options `pool-algorithm` (in config hot-swapping (by _mrbrdo_). Use options `pool-algorithm` (in config

2
api.c

@ -2159,7 +2159,7 @@ exitsama:
static void addpool(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group) static void addpool(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char *param, bool isjson, __maybe_unused char group)
{ {
char *url, *user, *pass; char *url, *user, *pass;
char *name, *desc, *algo; char *name = NULL, *desc = NULL, *algo = NULL;
struct pool *pool; struct pool *pool;
char *ptr; char *ptr;

2
configure.ac

@ -2,7 +2,7 @@
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
m4_define([v_maj], [4]) m4_define([v_maj], [4])
m4_define([v_min], [1]) m4_define([v_min], [1])
m4_define([v_mic], [270]) m4_define([v_mic], [271])
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
m4_define([v_ver], [v_maj.v_min.v_mic]) m4_define([v_ver], [v_maj.v_min.v_mic])
m4_define([lt_rev], m4_eval(v_maj + v_min)) m4_define([lt_rev], m4_eval(v_maj + v_min))

6
winbuild/dist/include/config.h vendored

@ -68,11 +68,11 @@
#endif #endif
#define VERSION "v4.1.270" #define VERSION "v4.1.271"
#define PACKAGE_NAME "sgminer" #define PACKAGE_NAME "sgminer"
#define PACKAGE_TARNAME "sgminer" #define PACKAGE_TARNAME "sgminer"
#define PACKAGE_VERSION "4.1.270" #define PACKAGE_VERSION "4.1.271"
#define PACKAGE_STRING "sgminer 4.1.270" #define PACKAGE_STRING "sgminer 4.1.271"
#define PACKAGE "sgminer" #define PACKAGE "sgminer"
#define SGMINER_PREFIX "" #define SGMINER_PREFIX ""

Loading…
Cancel
Save