Ticket #163: jabberd2_fix_missing_calls_to_fclose_and_va_end.diff

resolver/resolver.c

@@ -54 +54 @@
 
     if(fprintf(f, "%d", pid) < 0) {
         log_write(r->log, LOG_ERR, "couldn't write to %s: %s", pidfile, strerror(errno));
+        fclose(f);
         return;
     }
 
@@ -251 +252 @@
                 }
 #endif
 
-                /* !!! pull the list of mechanirs, and choose the best one.
+                /* !!! pull the list of mechanisms, and choose the best one.
                  *     if there isn't an appropriate one, error and bail */
 
                 /* authenticate */

sm/mod_disco.c

@@ -89 +89 @@
     xhash_put(dest, jid_full(svc->jid), (void *) svc);
 }
 
-/** unify the contest of dyn and stat */
+/** unify the contents of dyn and stat */
 static void _disco_unify_lists(disco_t d) {
     log_debug(ZONE, "unifying lists");
 
@@ -333 +333 @@
 
         svc->jid = jid_dup(pkt->from);
 
-        svc->features = xhash_new(9);
+        svc->features = xhash_new(11);
 
         /* link it in */
         xhash_put(d->dyn, jid_full(svc->jid), (void *) svc);
@@ -478 +478 @@
         pkt_id(pkt, result);
         pkt_free(pkt);
 
-        /* if they have privs, them show them any administrative things they can disco to */
+        /* if they have privs, then show them any administrative things they can disco to */
         if(aci_check(mod->mm->sm->acls, "disco", result->to)) {
             nad_append_elem(result->nad, NAD_ENS(result->nad, 2), "item", 3);
             nad_append_attr(result->nad, -1, "jid", mod->mm->sm->id);

sm/main.c

@@ -80 +80 @@
 
     if(fprintf(f, "%d", pid) < 0) {
         log_write(sm->log, LOG_ERR, "couldn't write to %s: %s", pidfile, strerror(errno));
+        fclose(f);
         return;
     }
 

c2s/main.c

@@ -56 +56 @@
 
     if(fprintf(f, "%d", pid) < 0) {
         log_write(c2s->log, LOG_ERR, "couldn't write to %s: %s", pidfile, strerror(errno));
+        fclose(f);
         return;
     }
 

sx/sx.c

@@ -315 +315 @@
     sz = pos - message;
     va_start(ap, msgfmt);
     vsnprintf(pos, MAX_DEBUG - sz, msgfmt, ap);
+    va_end(ap);
     fprintf(stderr,"%s", message);
     fprintf(stderr, "\n");
     fflush(stderr);

s2s/main.c

@@ -52 +52 @@
 
     if(fprintf(f, "%d", pid) < 0) {
         log_write(s2s->log, LOG_ERR, "couldn't write to %s: %s", pidfile, strerror(errno));
+        fclose(f);
         return;
     }
 

router/main.c

@@ -52 +52 @@
 
     if(fprintf(f, "%d", pid) < 0) {
         log_write(r->log, LOG_ERR, "couldn't write to %s: %s", pidfile, strerror(errno));
+        fclose(f);
         return;
     }
 

mio/mio_impl.h

@@ -84 +84 @@
     va_start(ap,msgfmt);
     fprintf(stderr,"mio.c#%d: ",line);
     vfprintf(stderr,msgfmt,ap);
+    va_end(ap);
     fprintf(stderr,"\n");
 }
 

util/log.c

@@ -192 +198 @@
     sz = pos - message;
     va_start(ap, msgfmt);
     vsnprintf(pos, MAX_DEBUG - sz, msgfmt, ap);
+    va_end(ap);
     fprintf(stderr,"%s", message);
     fprintf(stderr, "\n");
     fflush(stderr);