It looks like after your change the check against strlen in demangle_class_name isn't necessary. Go ahead and remove it and check this in. In future, please use diff -p or -up when generating patches to make them more readable. Thanks, Jason