@@ -57,7 +57,7 @@ int daemon(int nochdir, int noclose) if (nochdir == 0) (void)chdir("/"); - if (noclose==0 && (fd = open("/dev/null", O_RDWR, 0)) != -1) { + if (noclose == 0 && (fd = open("/dev/null", O_RDWR, 0)) != -1) { (void)dup2(fd, STDIN_FILENO); (void)dup2(fd, STDOUT_FILENO); (void)dup2(fd, STDERR_FILENO); daemon.c @@ -283,7 +283,7 @@ char *item_cachedump(const unsigned int slabs_clsid, const unsigned int limit, u bufcurr = 0; while (it != NULL && (limit == 0 || shown < limit)) { - len = snprintf(temp, 512, "ITEM %s [%d b; %lu s]\r\n", ITEM_key(it), it->nbytes - 2, it->time + stats.started); + len = snprintf(temp, sizeof(temp), "ITEM %s [%d b; %lu s]\r\n", ITEM_key(it), it->nbytes - 2, it->time + stats.started); if (bufcurr + len + 6 > memlimit) /* 6 is END\r\n\0 */ break; strcpy(buffer + bufcurr, temp); @@ -301,7 +301,9 @@ char *item_cachedump(const unsigned int slabs_clsid, const unsigned int limit, u void item_stats(char *buffer, const int buflen) { int i; + int linelen; char *bufcurr = buffer; + size_t bufleft = (size_t) buflen; rel_time_t now = current_time; if (buflen < 4096) { @@ -310,9 +312,18 @@ void item_stats(char *buffer, const int buflen) { } for (i = 0; i < LARGEST_ID; i++) { - if (tails[i] != NULL) - bufcurr += snprintf(bufcurr, (size_t)buflen, "STAT items:%d:number %u\r\nSTAT items:%d:age %u\r\n", + if (tails[i] != NULL) { + linelen = snprintf(bufcurr, bufleft, "STAT items:%d:number %u\r\nSTAT items:%d:age %u\r\n", i, sizes[i], i, now - tails[i]->time); + if (linelen + sizeof("END") < bufleft) { + bufcurr += linelen; + bufleft -= linelen; + } + else { + /* The caller didn't allocate enough buffer space. */ + break; + } + } } memcpy(bufcurr, "END", 4); return; items.c @@ -246,7 +246,7 @@ static int freecurr; static void conn_init(void) { freetotal = 200; freecurr = 0; - if (!(freeconns = (conn **)malloc(sizeof(conn *) * freetotal))) { + if ((freeconns = (conn **)malloc(sizeof(conn *) * freetotal)) == NULL) { perror("malloc()"); } return; @@ -936,7 +936,7 @@ static void process_stat(conn *c, token_t *tokens, const size_t ntokens) { int fd; int res; - if (!(wbuf = (char *)malloc(wsize))) { + if ((wbuf = (char *)malloc(wsize)) == NULL) { out_string(c, "SERVER_ERROR out of memory"); return; } @@ -2430,7 +2430,7 @@ static void save_pid(const pid_t pid, const char *pid_file) { if (pid_file == NULL) return; - if (!(fp = fopen(pid_file, "w"))) { + if ((fp = fopen(pid_file, "w")) == NULL) { fprintf(stderr, "Could not open the pid file %s for writing\n", pid_file); return; } @@ -2733,7 +2733,10 @@ int main (int argc, char **argv) { /* initialise deletion array and timer event */ deltotal = 200; delcurr = 0; - todelete = malloc(sizeof(item *) * deltotal); + if ((todelete = malloc(sizeof(item *) * deltotal)) == NULL) { + perror("failed to allocate memory for deletion array"); + exit(EXIT_FAILURE); + } delete_handler(0, 0, 0); /* sets up the event */ /* create the initial listening udp connection, monitored on all threads */ if (u_socket > -1) { memcached.c @@ -310,7 +310,7 @@ static void thread_libevent_process(int fd, short which, void *arg) { if (NULL != item) { conn *c = conn_new(item->sfd, item->init_state, item->event_flags, item->read_buffer_size, item->is_udp, me->base); - if (!c) { + if (c == NULL) { if (item->is_udp) { fprintf(stderr, "Can't listen for events on UDP socket\n"); exit(1); thread.c cdcf9f8d9c83c2d3df23e4f5dd85e341b7139c6a sgrimm sgrimm@b0b603af-a30f-0410-a34e-baf09ae79d0b http://github.com/tmaesaka/memcached/commit/129e3610e6f1a7eff02e6a7be7b6e0dd36c2e7fa 129e3610e6f1a7eff02e6a7be7b6e0dd36c2e7fa 2007-07-07T17:01:52-07:00 2007-07-07T17:01:52-07:00 Fix minor style inconsistencies and add some missing error checking. git-svn-id: http://code.sixapart.com/svn/memcached/trunk/server@587 b0b603af-a30f-0410-a34e-baf09ae79d0b 7036eb47ba71f23aca6438b3e699d8cadd3fa37c sgrimm sgrimm@b0b603af-a30f-0410-a34e-baf09ae79d0b