[SCM] calf/master: + Fixed memory corruption in audio_exception (doh!)

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0badcacfd0221ac6cd8504a71e8694155301be23
Author: kfoltman <kfoltman at 78b06b96-2940-0410-b7fc-879d825d01d8>
Date:   Mon Dec 24 10:54:04 2007 +0000

    + Fixed memory corruption in audio_exception (doh!)
    
    
    
    git-svn-id: https://calf.svn.sourceforge.net/svnroot/calf/trunk@42 78b06b96-2940-0410-b7fc-879d825d01d8

diff --git a/src/calf/giface.h b/src/calf/giface.h
index cbcffb2..0c6694b 100644
--- a/src/calf/giface.h
+++ b/src/calf/giface.h
@@ -466,8 +466,7 @@ struct audio_exception: public std::exception
     const char *text;
     std::string container;
 public:
-    audio_exception(const char *_text) : text(_text) {}
-    audio_exception(const std::string &t) : text(container.c_str()), container(t) {}
+    audio_exception(const std::string &t) : container(t) { text = container.c_str(); }
     virtual const char *what() const throw () { return text; }
     virtual ~audio_exception() throw () {}
 };
diff --git a/src/calf/jackhost.h b/src/calf/jackhost.h
index 878075b..e2abeef 100644
--- a/src/calf/jackhost.h
+++ b/src/calf/jackhost.h
@@ -80,7 +80,7 @@ public:
     void connect(const std::string &p1, const std::string &p2)
     {
         if (jack_connect(client, p1.c_str(), p2.c_str()) != 0)
-            throw audio_exception(("Could not connect ports "+p1+" and "+p2).c_str());
+            throw audio_exception("Could not connect ports "+p1+" and "+p2);
     }
     
     void close()

-- 
calf audio plugins packaging