Compare commits

...

2 Commits

Author SHA1 Message Date
b721d26fb8 avoid buffer overflow 2015-04-08 09:35:00 +00:00
7530c7c67d check for error condifiton 2015-04-08 09:34:46 +00:00
2 changed files with 6 additions and 6 deletions

View File

@ -680,7 +680,7 @@ writeHandler()
clientName());
status = pasynOctet->read(pvtOctet, pasynUser,
buffer, sizeof(buffer), &received, &eomReason);
if (received == 0) break;
if (status == asynError || received == 0) break;
#ifndef NO_TEMPORARY
if (received) debug("AsynDriverInterface::writeHandler(%s): flushing %ld bytes: \"%s\"\n",
clientName(), (long)received, StreamBuffer(buffer, received).expand()());

View File

@ -965,13 +965,13 @@ getFieldAddress(const char* fieldname, StreamBuffer& address)
else
{
// FIELD in this record or VAL in other record
char fullname[PVNAME_SZ + 1];
sprintf(fullname, "%s.%s", name(), fieldname);
if (dbNameToAddr(fullname, &dbaddr) != OK)
StreamBuffer fullname;
fullname.print("%s.%s", name(), fieldname);
if (dbNameToAddr(fullname(), &dbaddr) != OK)
{
// VAL in other record
sprintf(fullname, "%s.VAL", fieldname);
if (dbNameToAddr(fullname, &dbaddr) != OK) return false;
fullname.clear().print("%s.VAL", fieldname);
if (dbNameToAddr(fullname(), &dbaddr) != OK) return false;
}
}
address.append(&dbaddr, sizeof(dbaddr));