* [Cluster-devel] conga/ricci/modules/storage FileMagic.cpp
@ 2006-09-14 17:57 kupcevic
0 siblings, 0 replies; 2+ messages in thread
From: kupcevic @ 2006-09-14 17:57 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-09-14 17:57:56
Modified files:
ricci/modules/storage: FileMagic.cpp
Log message:
forgot to make fnc static
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/FileMagic.cpp.diff?cvsroot=cluster&r1=1.1&r2=1.2
--- conga/ricci/modules/storage/FileMagic.cpp 2006/09/14 17:52:04 1.1
+++ conga/ricci/modules/storage/FileMagic.cpp 2006/09/14 17:57:56 1.2
@@ -26,7 +26,7 @@
-String
+static String
__get_description(const String& filename,
const String& magic_filename = "")
{
^ permalink raw reply [flat|nested] 2+ messages in thread
* [Cluster-devel] conga/ricci/modules/storage FileMagic.cpp
@ 2006-09-23 9:26 kupcevic
0 siblings, 0 replies; 2+ messages in thread
From: kupcevic @ 2006-09-23 9:26 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-09-23 09:26:58
Modified files:
ricci/modules/storage: FileMagic.cpp
Log message:
storage module: don't free libmagic's return buffer - double free
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/FileMagic.cpp.diff?cvsroot=cluster&r1=1.2&r2=1.3
--- conga/ricci/modules/storage/FileMagic.cpp 2006/09/14 17:57:56 1.2
+++ conga/ricci/modules/storage/FileMagic.cpp 2006/09/23 09:26:58 1.3
@@ -56,14 +56,14 @@
throw String("unknown data detected");
magic_close(cookie); cookie = 0;
- free((char*) buff); buff = 0;
+ // free((char*) buff); buff = 0;
return descr;
} catch ( ... ) {
if (cookie)
magic_close(cookie);
- if (buff)
- free((char*) buff);
+ // if (buff)
+ // free((char*) buff);
throw;
}
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-09-23 9:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-09-14 17:57 [Cluster-devel] conga/ricci/modules/storage FileMagic.cpp kupcevic
-- strict thread matches above, loose matches on Subject: below --
2006-09-23 9:26 kupcevic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).