[XrdPosix] Use strncpy when copying checksum.

xrootd · Jun 23, 2017 · f07c8b7 · f07c8b7
1 parent 0caef52
commit f07c8b7
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/XrdPosix/XrdPosixAdmin.cc b/src/XrdPosix/XrdPosixAdmin.cc
@@ -105,10 +105,14 @@ int XrdPosixAdmin::Query(XrdCl::QueryCode::Code reqCode, void *buff, int bsz)
 //
    if (!XrdPosixMap::Result(Xrd.Query(reqCode, reqBuff, rspBuff)))
       {uint32_t rspSz = rspBuff->GetSize();
-       if (bsz >= (int)rspSz)
-          {strcpy((char *)buff, rspBuff->GetBuffer());
+       // if the string is null-terminated decrement the size
+       char *rspbuff = rspBuff->GetBuffer();
+       if ( !(rspbuff[rspSz - 1]) ) --rspSz;
+       if (bsz >= (int)rspSz + 1)
+          {strncpy((char *)buff, rspbuff, rspSz);
+           ((char*)buff)[rspSz] = 0; // make sure the string is null-terminated
            delete rspBuff;
-           return static_cast<int>(rspSz);
+           return static_cast<int>(rspSz + 1);
           }
        errno = ERANGE;
       }