summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Savochenko <rom_as@oscada.org>2013-01-05 02:51:08 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-01-05 02:54:37 +0100
commit5f99a2718025c4f2fbef86a450423a9c61e297f9 (patch)
treea1b7f93c1d9e86a2c1db926661bc9dd396d20f8c
parent1ae857eec3232689de8fc52669e9bf9006f97f74 (diff)
downloadtdelibs-5f99a2718025c4f2fbef86a450423a9c61e297f9.tar.gz
tdelibs-5f99a2718025c4f2fbef86a450423a9c61e297f9.zip
Fix memory leak in CUPS IPP processing
This resolves Bug 1369
-rw-r--r--tdeprint/cups/ipprequest.cpp22
1 files changed, 14 insertions, 8 deletions
diff --git a/tdeprint/cups/ipprequest.cpp b/tdeprint/cups/ipprequest.cpp
index 4bf899897..0fde06159 100644
--- a/tdeprint/cups/ipprequest.cpp
+++ b/tdeprint/cups/ipprequest.cpp
@@ -21,6 +21,7 @@
#include "cupsinfos.h"
#include <stdlib.h>
+#include <string>
#include <cups/language.h>
#include <kdebug.h>
#include <kglobal.h>
@@ -227,14 +228,19 @@ void IppRequest::addStringList_p(int group, int type, const TQString& name, cons
{
if (!name.isEmpty())
{
- ipp_attribute_t *attr = ippAddStrings(request_,(ipp_tag_t)group,(ipp_tag_t)type,name.latin1(),(int)(values.count()),NULL,NULL);
- int i(0);
- for (TQStringList::ConstIterator it=values.begin(); it != values.end(); ++it, i++)
-#ifdef HAVE_CUPS_1_6
- ippSetString(request_, &attr, i, strdup((*it).local8Bit()));
-#else // HAVE_CUPS_1_6
- attr->values[i].string.text = strdup((*it).local8Bit());
-#endif // HAVE_CUPS_1_6
+ //> Values buffer and references offset prepare
+ const char *vlsRefs[values.count()];
+ std::string vlsBuf;
+ for(unsigned i_vl = 0; i_vl < values.count(); i_vl++)
+ {
+ vlsRefs[i_vl] = (const char*)vlsBuf.size();
+ vlsBuf += values[i_vl].local8Bit();
+ vlsBuf += (char)0;
+ }
+ //> References update to pointers
+ for(unsigned i_vl = 0; i_vl < values.count(); i_vl++)
+ vlsRefs[i_vl] = vlsBuf.data()+(intptr_t)vlsRefs[i_vl];
+ ippAddStrings(request_,(ipp_tag_t)group,(ipp_tag_t)type,name.latin1(),(int)(values.count()),NULL,(const char**)&vlsRefs);
}
}