← Back to branch summary

~ubuntu-branches/ubuntu/wily/trafficserver/wily

« back to all changes in this revision

Viewing changes to mgmt/preparse/StoreReadConfig.cc

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2012-12-17 22:28:16 UTC
  • mfrom: (5.1.8 raring-proposed)
  • Revision ID: package-import@ubuntu.com-20121217222816-7xwjsx5k76zkb63d
Tags: 3.2.0-1ubuntu1
* Revert FreeBSD strerror_r() fixes that give errors with glibc 2.16.
* Apply patch from Konstantinos Margaritis to define barriers on ARM.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mgmt/preparse/StoreReadConfig.cc
57
57
    while (*e && !isdigit(*e))
58
58
      e++;
59
59
    if (e && *e) {
 
60
      // coverity[secure_coding]
60
61
      if (1 != sscanf(e, "%" PRId64 "", &size)) {
61
62
        err = "error parsing size";
62
63
        goto Lfail;
66
67
  return NULL;
67
68
Lfail:
68
69
  int e_size = 1000;
69
 
  char *e = (char *) xmalloc(e_size);
 
70
  char *e = (char *)ats_malloc(e_size);
 
71
 
70
72
  snprintf(e, e_size, "Error reading storage.config: %s line %d\n", err, ln);
71
73
  return e;
72
74
}