Merge branch 'BenBE-asprintf-fixes'

Author: natoscott

Header.c

@@ -155,7 +155,7 @@ void Header_writeBackToSettings(const Header* this) {
 
       for (int i = 0; i < len; i++) {
          const Meter* meter = (Meter*) Vector_get(vec, i);
-         char* name;
+         char* name = NULL;
          if (meter->param && As_Meter(meter) == &DynamicMeter_class) {
             const char* dynamic = DynamicMeter_lookup(settings->dynamicMeters, meter->param);
             xAsprintf(&name, "%s(%s)", As_Meter(meter)->name, dynamic);

XUtils.c

@@ -237,6 +237,8 @@ size_t strnlen(const char* str, size_t maxLen) {
 #endif
 
 int xAsprintf(char** strp, const char* fmt, ...) {
+   *strp = NULL;
+
    va_list vl;
    va_start(vl, fmt);
    int r = vasprintf(strp, fmt, vl);

linux/LinuxProcessTable.c

@@ -1471,18 +1471,20 @@ static char* LinuxProcessTable_updateTtyDevice(TtyDriver* ttyDrivers, unsigned l
       if (min > ttyDrivers[i].minorTo) {
          continue;
       }
+
       unsigned int idx = min - ttyDrivers[i].minorFrom;
+
       struct stat sb;
-      char* fullPath;
+
       for (;;) {
-         xAsprintf(&fullPath, "%s/%d", ttyDrivers[i].path, idx);
+         char* fullPath = NULL;
+         size_t fullPathLen = xAsprintf(&fullPath, "%s/%d", ttyDrivers[i].path, idx);
          int err = stat(fullPath, &sb);
          if (err == 0 && major(sb.st_rdev) == maj && minor(sb.st_rdev) == min) {
             return fullPath;
          }
-         free(fullPath);
 
-         xAsprintf(&fullPath, "%s%d", ttyDrivers[i].path, idx);
+         xSnprintf(fullPath, fullPathLen + 1, "%s%d", ttyDrivers[i].path, idx);
          err = stat(fullPath, &sb);
          if (err == 0 && major(sb.st_rdev) == maj && minor(sb.st_rdev) == min) {
             return fullPath;
@@ -1495,12 +1497,14 @@ static char* LinuxProcessTable_updateTtyDevice(TtyDriver* ttyDrivers, unsigned l
 
          idx = min;
       }
+
       int err = stat(ttyDrivers[i].path, &sb);
       if (err == 0 && tty_nr == sb.st_rdev) {
          return xStrdup(ttyDrivers[i].path);
       }
    }
-   char* out;
+
+   char* out = NULL;
    xAsprintf(&out, "/dev/%u:%u", maj, min);
    return out;
 }

pcp/PCPDynamicColumn.c

@@ -59,7 +59,7 @@ static void PCPDynamicColumn_parseMetric(PCPDynamicColumns* columns, PCPDynamicC
    /* derived metrics in all dynamic columns for simplicity */
    char* error;
    if (pmRegisterDerivedMetric(column->metricName, value, &error) < 0) {
-      char* note;
+      char* note = NULL;
       xAsprintf(&note,
                 "%s: failed to parse expression in %s at line %u\n%s\n",
                 pmGetProgname(), path, line, error);

pcp/PCPDynamicMeter.c

@@ -73,7 +73,7 @@ static void PCPDynamicMeter_parseMetric(PCPDynamicMeters* meters, PCPDynamicMete
       /* use derived metrics in dynamic meters for simplicity */
       char* error;
       if (pmRegisterDerivedMetric(metric->name, value, &error) < 0) {
-         char* note;
+         char* note = NULL;
          xAsprintf(&note,
                    "%s: failed to parse expression in %s at line %u\n%s\n%s",
                    pmGetProgname(), path, line, error, pmGetProgname());