@@ -528,7 +528,7 @@ void INF_database_info(thread_db* tdbb,
528528
529529 TEXT site[256 ];
530530 ISC_get_host (site, sizeof (site));
531- const ULONG siteLen = MIN (strlen (site), MAX_UCHAR);
531+ const ULONG siteLen = MIN (fb_strlen (site), MAX_UCHAR);
532532 counts_buffer.push (static_cast <UCHAR>(siteLen));
533533 counts_buffer.push (reinterpret_cast <UCHAR*>(site), siteLen);
534534
@@ -622,7 +622,7 @@ void INF_database_info(thread_db* tdbb,
622622 {
623623 const auto attachment = tdbb->getAttachment ();
624624 const char * userName = attachment->getUserName (" <Unknown>" ).c_str ();
625- const ULONG len = MIN (strlen (userName), MAX_UCHAR);
625+ const ULONG len = MIN (fb_strlen (userName), MAX_UCHAR);
626626 *p++ = static_cast <UCHAR>(len);
627627 memcpy (p, userName, len);
628628
@@ -653,7 +653,7 @@ void INF_database_info(thread_db* tdbb,
653653 names.insert (pos, userName);
654654
655655 p = buffer;
656- const ULONG len = MIN (strlen (userName), MAX_UCHAR);
656+ const ULONG len = MIN (fb_strlen (userName), MAX_UCHAR);
657657 *p++ = static_cast <UCHAR>(len);
658658 memcpy (p, userName, len);
659659
@@ -838,7 +838,7 @@ void INF_database_info(thread_db* tdbb,
838838 if (tdbb->getAttachment ()->locksmith (tdbb, GET_DBCRYPT_INFO))
839839 {
840840 const char * key = dbb->dbb_crypto_manager ->getKeyName ();
841- if (!(info = INF_put_item (item, strlen (key), key, info, end)))
841+ if (!(info = INF_put_item (item, fb_strlen (key), key, info, end)))
842842 return ;
843843
844844 continue ;
@@ -853,7 +853,7 @@ void INF_database_info(thread_db* tdbb,
853853 if (tdbb->getAttachment ()->locksmith (tdbb, GET_DBCRYPT_INFO))
854854 {
855855 const char * key = dbb->dbb_crypto_manager ->getPluginName ();
856- if (!(info = INF_put_item (item, strlen (key), key, info, end)))
856+ if (!(info = INF_put_item (item, fb_strlen (key), key, info, end)))
857857 return ;
858858
859859 continue ;
0 commit comments