Fixed undefined variable value with certain code paths.

In sentinelFlushConfig() fd could be undefined when the following if
statement was true:

        if (rewrite_status == -1) goto werr;

This could cause random file descriptors to get closed.
This commit is contained in:
antirez 2014-03-24 21:07:44 +01:00
parent fc0fb0bad3
commit 35667d75c3

View File

@ -1560,7 +1560,7 @@ void rewriteConfigSentinelOption(struct rewriteConfigState *state) {
*
* On failure the function logs a warning on the Redis log. */
void sentinelFlushConfig(void) {
int fd;
int fd = -1;
int saved_hz = server.hz;
int rewrite_status;
@ -1572,7 +1572,6 @@ void sentinelFlushConfig(void) {
if ((fd = open(server.configfile,O_RDONLY)) == -1) goto werr;
if (fsync(fd) == -1) goto werr;
if (close(fd) == EOF) goto werr;
return;
werr: