1--- source/tools/genrb/rbutil.c
2+++ source/tools/genrb/rbutil.c
3@@ -30,7 +30,12 @@
4 get_dirname(char *dirname,
5             const char *filename)
6 {
7-  const char *lastSlash = uprv_strrchr(filename, U_FILE_SEP_CHAR) + 1;
8+  const char *lastSlash = uprv_strrchr(filename, U_FILE_SEP_CHAR);
9+  if(lastSlash == NULL) {
10+    lastSlash = filename;
11+  } else {
12+     ++lastSlash;
13+  }
14
15   if(lastSlash>filename) {
16     uprv_strncpy(dirname, filename, (lastSlash - filename));
17@@ -46,7 +51,12 @@
18              const char *filename)
19 {
20   /* strip off any leading directory portions */
21-  const char *lastSlash = uprv_strrchr(filename, U_FILE_SEP_CHAR) + 1;
22+  const char *lastSlash = uprv_strrchr(filename, U_FILE_SEP_CHAR);
23+  if(lastSlash == NULL) {
24+    lastSlash = filename;
25+  } else {
26+     ++lastSlash;
27+  }
28   char *lastDot;
29
30   if(lastSlash>filename) {
31