FileSystem: fix a bug that could cause strlen being called with NULL …

…pointer in debug build (#91)

Components/FileSystem/FileSystem.scvd

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <component_viewer schemaVersion="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="Component_Viewer.xsd">
-  <component name="File System" shortname="FS" version="8.0.1"/>    <!-- name and version of the component  -->
+  <component name="File System" shortname="FS" version="8.0.2"/>    <!-- name and version of the component  -->
 
   <typedefs>
     <!-- Flash Sector information (Driver_Flash.h line 58) -->

Components/FileSystem/Include/rl_fs.h

@@ -1,6 +1,6 @@
 /*------------------------------------------------------------------------------
  * MDK Middleware - Component ::File System
- * Copyright (c) 2004-2024 Arm Limited (or its affiliates). All rights reserved.
+ * Copyright (c) 2004-2025 Arm Limited (or its affiliates). All rights reserved.
  *------------------------------------------------------------------------------
  * Name:    rl_fs.h
  * Purpose: File System API
@@ -14,7 +14,7 @@
 
 #define MW_FS_VERSION_MAJOR      8
 #define MW_FS_VERSION_MINOR      0
-#define MW_FS_VERSION_PATCH      1
+#define MW_FS_VERSION_PATCH      2
 
 // ==== Enumeration, structures, defines ====
 

Components/FileSystem/Source/fs_common.c

@@ -1,6 +1,6 @@
 /*------------------------------------------------------------------------------
  * MDK Middleware - Component ::File System
- * Copyright (c) 2004-2023 Arm Limited (or its affiliates). All rights reserved.
+ * Copyright (c) 2004-2025 Arm Limited (or its affiliates). All rights reserved.
  *------------------------------------------------------------------------------
  * Name:    fs_common.c 
  * Purpose: Common file system functions
@@ -205,8 +205,8 @@ uint32_t fs_strmatch (const char s1[], const char s2[], uint32_t len1, uint32_t
     }
 
     if (len2 != 0U) {
-      n1 = strlen (s1);
-      n2 = strlen (s2);
+      n1 = fs_strlen (s1);
+      n2 = fs_strlen (s2);
 
       if ((n1 >= len2) && (n2 >= len2)) {
         n1 -= len2;
@@ -224,6 +224,23 @@ uint32_t fs_strmatch (const char s1[], const char s2[], uint32_t len1, uint32_t
   return (match);
 }
 
+/**
+  Get length of a string
+
+  \param[in] sp  string pointer
+  \return    length of the string
+ */
+uint32_t fs_strlen (const char sp[]) {
+  uint32_t i;
+
+  i = 0U;
+  if (sp != NULL) {
+    while (sp[i] != '\0') {
+      i++;
+    }
+  }
+  return (i);
+}
 
 /**
   Read U16 byte-aligned from LE byte order

Components/FileSystem/Source/fs_common.h

@@ -1,6 +1,6 @@
 /*------------------------------------------------------------------------------
  * MDK Middleware - Component ::File System
- * Copyright (c) 2004-2024 Arm Limited (or its affiliates). All rights reserved.
+ * Copyright (c) 2004-2025 Arm Limited (or its affiliates). All rights reserved.
  *------------------------------------------------------------------------------
  * Name:    fs_common.h
  * Purpose: Common file system function definitions
@@ -18,6 +18,7 @@ extern int32_t      fs_drive_id (const char *path, const char **fn);
 extern int32_t      fs_strpos (const char *sp, const char ch);
 extern uint32_t     fs_strncasecmp (const char *s1, const char *s2, uint32_t n);
 extern uint32_t     fs_strmatch (const char *s1, const char *s2, uint32_t len1, uint32_t len2);
+extern uint32_t     fs_strlen (const char *sp);
 
 extern uint16_t     get_u16 (const uint8_t *p16);
 extern void         set_u16 (uint8_t *p16, uint16_t val);

Components/FileSystem/Source/fs_efs.c

@@ -1,6 +1,6 @@
 /*------------------------------------------------------------------------------
  * MDK Middleware - Component ::File System
- * Copyright (c) 2004-2024 Arm Limited (or its affiliates). All rights reserved.
+ * Copyright (c) 2004-2025 Arm Limited (or its affiliates). All rights reserved.
  *------------------------------------------------------------------------------
  * Name:    fs_efs.c
  * Purpose: Embedded File System Implementation
@@ -452,7 +452,7 @@ static const char *file_name_validate (const char *path) {
     }
   }
   /* Path is not valid */
-  EvrFsEFS_FileNameInvalid (p, strlen(p));
+  EvrFsEFS_FileNameInvalid (p, fs_strlen(p));
   return (NULL);
 }
 
@@ -546,7 +546,7 @@ static fsStatus file_create (fsEFS_Handle *fh, const char *fname) {
   }
 
   /* Determine amount of free space required to store file name */
-  fn_len = strlen (fname) + 1U;
+  fn_len = fs_strlen (fname) + 1U;
 
   /* Align file name length */
   fn_len = (fn_len + 3U) & ~3U;
@@ -1769,7 +1769,7 @@ __WEAK fsStatus efs_open (int32_t handle, const char *fn, int32_t openmode) {
   fsStatus status;
 
   EvrFsEFS_FileOpen (handle, fn, openmode);
-  EvrFsEFS_FileName (fn, strlen(fn));
+  EvrFsEFS_FileName (fn, fs_strlen(fn));
 
   if ((handle < 0) || (handle >= fs_efs_fh_cnt)) {
     /* Invalid parameter: handle number out of range */
@@ -2245,7 +2245,7 @@ __WEAK fsStatus efs_delete (const char *path, fsEFS_Volume *vol) {
 
   /* Deleting file */
   EvrFsEFS_FileDelete (vol->DrvLet, path);
-  EvrFsEFS_FileName  (path, strlen(path));
+  EvrFsEFS_FileName  (path, fs_strlen(path));
 
   path = file_name_validate (path);
   if (path == NULL) {
@@ -2378,8 +2378,8 @@ __WEAK fsStatus efs_rename (const char *fn, const char *newname, fsEFS_Volume *v
 
   /* Renaming file fn to newname */
   EvrFsEFS_FileRename (vol->DrvLet, fn, newname);
-  EvrFsEFS_FileName  (fn, strlen(fn));
-  EvrFsEFS_FileName  (newname, strlen(newname));
+  EvrFsEFS_FileName  (fn, fs_strlen(fn));
+  EvrFsEFS_FileName  (newname, fs_strlen(newname));
 
   stat = efs_vol_chk (EFS_STATUS_MOUNT, vol);
   if (stat != fsOK) {

Components/FileSystem/Source/fs_fat.c

@@ -1,6 +1,6 @@
 /*------------------------------------------------------------------------------
  * MDK Middleware - Component ::File System
- * Copyright (c) 2004-2024 Arm Limited (or its affiliates). All rights reserved.
+ * Copyright (c) 2004-2025 Arm Limited (or its affiliates). All rights reserved.
  *------------------------------------------------------------------------------
  * Name:    fs_fat.c
  * Purpose: FAT File System Implementation
@@ -3315,8 +3315,8 @@ static fsStatus label_read (fsFAT_Volume *vol, char *buf) {
   while (entry_pos_inc (&pos, 1, vol));
 
   #ifdef FS_DEBUG
-  if (strlen(buf) != 0) {
-    EvrFsFAT_LabelString (buf, strlen(buf));
+  if (fs_strlen(buf) != 0) {
+    EvrFsFAT_LabelString (buf, fs_strlen(buf));
   } else {
     EvrFsFAT_LabelNotSet (vol->DrvLet);
   }
@@ -4002,7 +4002,7 @@ static fsStatus path_create (PATH_INFO *pinfo, bool mkdir, fsFAT_Volume *vol) {
         if (name_nt_gen (sn, num++) == false) {
           return (fsError);
         }
-        pinfo_nt.fn_len = (uint8_t)strlen (sn);
+        pinfo_nt.fn_len = (uint8_t)fs_strlen (sn);
         stat = frec_find_elink (&pinfo_nt, vol);
         if (stat == fsFileNotFound) {
           stat = frec_find (&pinfo_nt, vol);
@@ -4380,8 +4380,8 @@ __WEAK fsStatus fat_format (fsFAT_Volume *vol, const char *opt) {
   /* Formatting drive */
   EvrFsFAT_FormatDrive (vol->DrvLet);
   #ifdef FS_DEBUG
-  if (strlen(opt) != 0) {
-    EvrFsFAT_OptionsString (opt, strlen(opt));
+  if (fs_strlen(opt) != 0) {
+    EvrFsFAT_OptionsString (opt, fs_strlen(opt));
   }
   #endif
 
@@ -4772,7 +4772,7 @@ __WEAK fsStatus fat_open (int32_t handle, const char *path, int32_t openmode) {
   uint16_t  mode;
 
   EvrFsFAT_FileOpen (handle, path, openmode);
-  EvrFsFAT_PathName (path, strlen(path));
+  EvrFsFAT_PathName (path, fs_strlen(path));
 
   if ((handle < 0) || (handle >= fs_fat_fh_cnt)) {
     /* Invalid parameter: handle number out of range */
@@ -5547,10 +5547,10 @@ __WEAK fsStatus fat_delete (const char *path, const char *options, fsFAT_Volume
 
   /* Deleting file */
   EvrFsFAT_FileDelete (vol->DrvLet, path);
-  EvrFsFAT_PathName (path, strlen(path));
+  EvrFsFAT_PathName (path, fs_strlen(path));
   #ifdef FS_DEBUG
-  if (strlen(options) != 0) {
-    EvrFsFAT_OptionsString (options, strlen(options));
+  if (fs_strlen(options) != 0) {
+    EvrFsFAT_OptionsString (options, fs_strlen(options));
   }
   #endif
 
@@ -5831,8 +5831,8 @@ __WEAK fsStatus fat_rename (const char *path, const char *newname, fsFAT_Volume
 
   /* Renaming file */
   EvrFsFAT_FileRename (vol->DrvLet, path, newname);
-  EvrFsFAT_PathName (path, strlen(path));
-  EvrFsFAT_PathName (newname, strlen(newname));
+  EvrFsFAT_PathName (path, fs_strlen(path));
+  EvrFsFAT_PathName (newname, fs_strlen(newname));
 
   if ((path == NULL) || (newname == NULL)) {
     /* Invalid parameters */
@@ -5842,7 +5842,7 @@ __WEAK fsStatus fat_rename (const char *path, const char *newname, fsFAT_Volume
   if (path_validate (path)) {
     return (fsInvalidPath);
   }
-  if (name_validate (newname, strlen(newname)) == 0U) {
+  if (name_validate (newname, fs_strlen(newname)) == 0U) {
     return (fsInvalidPath);
   }
 
@@ -5948,7 +5948,7 @@ __WEAK fsStatus fat_mkdir (const char *path, fsFAT_Volume *vol) {
 
   /* Creating directory */
   EvrFsFAT_DirCreate (vol->DrvLet, path);
-  EvrFsFAT_PathName (path, strlen(path));
+  EvrFsFAT_PathName (path, fs_strlen(path));
 
   if (path == NULL) {
     /* Invalid parameters */
@@ -6009,10 +6009,10 @@ __WEAK fsStatus fat_rmdir (const char *path, const char *options, fsFAT_Volume *
 
   /* Removing directory */
   EvrFsFAT_DirRemove (vol->DrvLet, path, options);
-  EvrFsFAT_PathName (path, strlen(path));
+  EvrFsFAT_PathName (path, fs_strlen(path));
   #ifdef FS_DEBUG
-  if (strlen(options) != 0) {
-    EvrFsFAT_OptionsString (options, strlen(options));
+  if (fs_strlen(options) != 0) {
+    EvrFsFAT_OptionsString (options, fs_strlen(options));
   }
   #endif
 
@@ -6271,7 +6271,7 @@ __WEAK fsStatus fat_chdir (const char *path, fsFAT_Volume *vol) {
 
   /* Setting current directory */
   EvrFsFAT_ChDir (vol->DrvLet, path);
-  EvrFsFAT_PathName (path, strlen(path));
+  EvrFsFAT_PathName (path, fs_strlen(path));
 
   if (path == NULL) {
     /* Invalid parameters */
@@ -6417,7 +6417,7 @@ __WEAK fsStatus fat_pwd (char *path, uint32_t len, fsFAT_Volume *vol) {
     }
     while (clus != child);
 
-    sz = strlen(&path[1]);
+    sz = fs_strlen(&path[1]);
 
     if ((offs - sz) < 2) {
       /* Input buffer to small */
@@ -6475,7 +6475,7 @@ __WEAK fsStatus fat_attrib (fsFAT_Volume *vol, const char *path, uint32_t attrib
 
   /* Setting file attributes */
   EvrFsFAT_AttribSet (vol->DrvLet, path, attrib);
-  EvrFsFAT_PathName (path, strlen(path));
+  EvrFsFAT_PathName (path, fs_strlen(path));
 
   if ((path == NULL) || (attrib == 0U)) {
     /* Invalid parameters */

Components/FileSystem/Source/fs_mapi.c

@@ -1,6 +1,6 @@
 /*------------------------------------------------------------------------------
  * MDK Middleware - Component ::File System
- * Copyright (c) 2004-2024 Arm Limited (or its affiliates). All rights reserved.
+ * Copyright (c) 2004-2025 Arm Limited (or its affiliates). All rights reserved.
  *------------------------------------------------------------------------------
  * Name:    fs_mapi.c
  * Purpose: File Maintenance API Functions
@@ -330,7 +330,7 @@ fsStatus ffind (const char *pattern, fsFileInfo *info) {
       len2 = 0U;
     }
     else {
-      len2  = strlen (p);
+      len2  = fs_strlen (p);
       len2 -= (uint32_t)(len1 + 1);
     }
   }
@@ -367,7 +367,7 @@ fsStatus ffind (const char *pattern, fsFileInfo *info) {
     }
     else {
       /* No wildcard, must exactly match (case insensitive) */
-      if (fs_strncasecmp (&info->name[0], &p[0], strlen(info->name)) == 0) {
+      if (fs_strncasecmp (&info->name[0], &p[0], fs_strlen(info->name)) == 0) {
         /* Exact match */
         RETURN (fsOK);
       }

Documentation/Doxygen/FileSystem/src/revision_history.md

@@ -6,8 +6,9 @@
       <th>Description</th>
     </tr>
     <tr>
-      <td>V8.0.1</td>
+      <td>V8.0.2</td>
       <td>
+        - fixed bug that could cause strlen being called with NULL pointer in debug build
         - fixed bug in memory card layer for SPI mode that prevented correct device size recognition
       </td>
     </tr>

Documentation/Doxygen/General/src/revision_history.md

@@ -13,7 +13,7 @@
     <td>V8.0.1-dev</td>
     <td>
       - Network Component Version 8.1.0
-      - FileSystem Component Version 8.0.1
+      - FileSystem Component Version 8.0.2
     </td>
   </tr>
   <tr>

Keil.MDK-Middleware.pdsc

@@ -16,7 +16,8 @@
       Network Component Version 8.1.0
       - added support for simultaneous outgoing connections via different network interfaces
       - fixed handling of Ethernet drivers not supporting multicast address filtering
-      FileSystem Component Version 8.0.1
+      FileSystem Component Version 8.0.2
+      - fixed bug that could cause strlen being called with NULL pointer in debug build
       - fixed bug in memory card layer for SPI mode that prevented correct device size recognition
     </release>
     <release version="7.17.0" date="2024-01-17">
@@ -1158,7 +1159,7 @@
     </bundle>
 
     <!-- File System (MDK) -->
-    <bundle Cbundle="MDK" Cclass="File System" Cversion="8.0.1">
+    <bundle Cbundle="MDK" Cclass="File System" Cversion="8.0.2">
       <description>File Access on various storage devices</description>
       <doc>Documentation/html/FileSystem/index.html</doc>
       <component Cgroup="CORE" condition="CMSIS Core with RTOS and File System I/O">