- extract_token(floorname, rbuf, 0, FDELIM, sizeof floorname);
- strcpy(roomname, &rbuf[strlen(floorname)+1]);
+ len = extract_token(floorname, rbuf, 0, FDELIM, sizeof floorname);
+ if (len < 0) len = 0;
+ safestrncpy(roomname, &rbuf[len + 1], sizeof(roomname));