X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fcommon.c;h=b781cc1ae370c01f43a4f591adbbc41d35a62cc1;hb=afca2e817dbc7592abd49a32e3457772afc98cd7;hp=253ed9d875b4dfda15bd1df21a2da2b60782b41b;hpb=870b8c04557f0b7441cc502debaf537984d77e2a;p=openocd.git

diff --git a/src/flash/common.c b/src/flash/common.c
index 253ed9d875..b781cc1ae3 100644
--- a/src/flash/common.c
+++ b/src/flash/common.c
@@ -16,31 +16,34 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "common.h"
-#include "log.h"
+#include <helper/log.h>
 
 unsigned get_flash_name_index(const char *name)
 {
-	const char *index = strchr(name, '.');
-	if (NULL == index)
+	const char *name_index = strrchr(name, '.');
+	if (NULL == name_index)
 		return 0;
+	if (name_index[1] < '0' || name_index[1] > '9')
+		return ~0U;
 	unsigned requested;
-	int retval = parse_uint(index + 1, &requested);
-	// detect parsing error by forcing past end of bank list
+	int retval = parse_uint(name_index + 1, &requested);
+	/* detect parsing error by forcing past end of bank list */
 	return (ERROR_OK == retval) ? requested : ~0U;
 }
 
 bool flash_driver_name_matches(const char *name, const char *expected)
 {
 	unsigned blen = strlen(name);
-	// only match up to the length of the driver name...
+	/* only match up to the length of the driver name... */
 	if (strncmp(name, expected, blen) != 0)
 		return false;
 
-	// ...then check that name terminates at this spot.
+	/* ...then check that name terminates at this spot. */
 	return expected[blen] == '.' || expected[blen] == '\0';
 }