Author: adrian.chadd
Date: Mon Feb 2 10:53:37 2009
New Revision: 13782
Modified:
branches/LUSCA_HEAD/src/refresh_check.c
Log:
strBuf() -> stringDupToC(). Again, because of quoting, its easier to create
a temporary C string and free it later. This should be revisited!
Modified: branches/LUSCA_HEAD/src/refresh_check.c
==============================================================================
--- branches/LUSCA_HEAD/src/refresh_check.c (original)
+++ branches/LUSCA_HEAD/src/refresh_check.c Mon Feb 2 10:53:37 2009
@@ -286,6 +286,8 @@
for (; format; format = format->next) {
char buf[256];
const char *str = NULL;
+ const char *str2 = NULL;
+ int do_free = 0;
const char *quoted;
switch (format->type) {
case REFRESH_CHECK_URI:
@@ -297,19 +299,23 @@
break;
case REFRESH_CHECK_RESP_HEADER:
sb = httpHeaderGetByName(&reply->header, format->header);
- str = strBuf(sb);
+ str = stringDupToC(&sb);
+ do_free = 1;
break;
case REFRESH_CHECK_RESP_HEADER_ID:
sb = httpHeaderGetStrOrList(&reply->header, format->header_id);
- str = strBuf(sb);
+ str = stringDupToC(&sb);
+ do_free = 1;
break;
case REFRESH_CHECK_RESP_HEADER_MEMBER:
sb = httpHeaderGetByNameListMember(&reply->header, format->header,
format->member, format->separator);
- str = strBuf(sb);
+ str = stringDupToC(&sb);
+ do_free = 1;
break;
case REFRESH_CHECK_RESP_HEADER_ID_MEMBER:
sb = httpHeaderGetListMember(&reply->header, format->header_id,
format->member, format->separator);
- str = strBuf(sb);
+ str = stringDupToC(&sb);
+ do_free = 1;
break;
case REFRESH_CHECK_UNKNOWN:
@@ -317,6 +323,8 @@
fatal("unknown refresh_check_program format error");
break;
}
+ str2 = str;
+
if (!str || !*str)
str = "-";
if (!first)
@@ -324,6 +332,8 @@
quoted = rfc1738_escape(str);
memBufAppend(&mb, quoted, strlen(quoted));
stringClean(&sb);
+ if (do_free)
+ safe_free(str2);
first = 0;
}
return mb.buf;
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"lusca-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/lusca-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
