[FIX] no opengl probe comes 27/29927/2
authorVitaliy Cherepanov <v.cherepanov@samsung.com>
Wed, 5 Nov 2014 15:40:10 +0000 (18:40 +0300)
committerVitaliy Cherepanov <v.cherepanov@samsung.com>
Wed, 5 Nov 2014 16:01:50 +0000 (19:01 +0300)
(map scan fix)

Change-Id: Ie55832c0364b62632bc3a89e3ace5cf81488592d
Signed-off-by: Vitaliy Cherepanov <v.cherepanov@samsung.com>
helper/damaps.c

index d0390f4..2cff157 100755 (executable)
@@ -136,24 +136,26 @@ static int read_mapping_line(FILE *mapfile, struct map_t *m)
 
        m->is_instrument = 0;
        if (ret > 0 && ret != EOF) {
+               int len = 0;
+
                if (ch2 != '\n') {
                        ret = (fgets((char *)m->filename, sizeof(m->filename), mapfile) != NULL);
                        if (ret) {
-                               int len;
                                /* remove leading white spaces */
                                if (m->filename[0] == ' ') {
                                        char *p = m->filename;
                                        while (*p == ' ')
                                                p++;
                                        len = strlen(p);
-                                       memcpy(m->filename, p, len);
+                                       memmove(m->filename, p, len);
                                } else
                                        len = strlen(m->filename);
-
-                               m->filename[len-1] = '\0';
+                               if (len > 0)
+                                       len--;
                        }
-               } else
-                       m->filename[0] = '\0';  /* no filename */
+               }
+
+               m->filename[len] = '\0';
 
                return 1;
        } else