Ticket #41174: tool.c.diff

tool.c

@@ -420 +420 @@
                          * strrcpy(), we have overlapping blocks.
                          */
                         im_strncpy( value, toolitem->label, MAX_NAME );
+
+                        /* This memccpy crashes on Mavericks */
+                        /*
                         for( i = 0; value[i]; i++ )
                                 if( value[i] == '_' )
                                         memccpy( value + i, value + i + 1,
                                                 0, MAX_NAME - i );
+                        */
+
+                        char *dst = value;
+                        for( i = 0; value[i]; i++ )
+                                if ( value[i] != '_' )
+                                        *dst++ = value[i];
+                        *dst = 0;
+                        memmove(value, dst, strlen(dst));
+
                         IM_SETSTR( toolitem->name, value );
                 }