[gentoo-commits] gentoo-x86 commit in media-sound/rosegarden/files: rosegarden-13.10-segfault_at_export_to_lilypond.patch

[Samuli Suominen (ssuominen)]

ssuominen    14/02/05 11:26:28

  Added:               
                        rosegarden-13.10-segfault_at_export_to_lilypond.patch
  Log:
  Migrate to usex. Apply upstream patch to avoid crashing at exporting to lilypond wrt #500344 by Ulf Dambacher
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

Revision  Changes    Path
1.1                  media-sound/rosegarden/files/rosegarden-13.10-segfault_at_export_to_lilypond.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rosegarden/files/rosegarden-13.10-segfault_at_export_to_lilypond.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rosegarden/files/rosegarden-13.10-segfault_at_export_to_lilypond.patch?rev=1.1&content-type=text/plain

Index: rosegarden-13.10-segfault_at_export_to_lilypond.patch
===================================================================
Index: src/document/io/LilyPondExporter.cpp
===================================================================
--- src/document/io/LilyPondExporter.cpp	(revision 13602)
+++ src/document/io/LilyPondExporter.cpp	(revision 13603)
@@ -706,13 +706,18 @@
                 std::string header = protectIllegalChars(metadata.get<String>(property));
                 if (property == headerCopyright) {
                     // replace a (c) or (C) with a real Copyright symbol
-                    int posCpy = header.find("c");
-                    if (!posCpy) posCpy = header.find("C");
-                    if (posCpy) {
-                        std::string leftOfCpy = header.substr(0, posCpy - 1);
-                        std::string rightOfCpy = header.substr(posCpy + 2);
+                    size_t posCpy = header.find("(c)");
+                    if (posCpy == std::string::npos) posCpy = header.find("(C)");
+                    if (posCpy != std::string::npos) {
+                        std::string leftOfCpy = header.substr(0, posCpy);
+                        std::string rightOfCpy = header.substr(posCpy + 3);
                         str << indent(col) << property << " =  \\markup { \"" << leftOfCpy << "\""
                             << "\\char ##x00A9" << "\"" << rightOfCpy << "\" }" << std::endl;
+                    } else {
+                        if (header != "") {
+                            str << indent(col) << property << " = \""
+                                << header << "\"" << std::endl;
+                        }
                     }
                 } else if (header != "") {
                     str << indent(col) << property << " = \"" << header << "\"" << std::endl;