[SCM] BOINC packaging branch, wheezy, updated. debian/7.0.27+dfsg-5-15-g43ed716
Guo Yixuan
culu.gyx at gmail.com
Mon Jun 24 09:41:32 UTC 2013
The following commit has been merged in the wheezy branch:
commit c4550d673f2d74d263341377554e97cdc796adb7
Author: Guo Yixuan <culu.gyx at gmail.com>
Date: Mon Jun 24 16:39:24 2013 +0800
moved macros to parse.h
diff --git a/debian/patches/CVE-2013-2298-Scheduler-fix-security-vulnerabilities.patch b/debian/patches/CVE-2013-2298-Scheduler-fix-security-vulnerabilities.patch
index 34f1a45..9169637 100644
--- a/debian/patches/CVE-2013-2298-Scheduler-fix-security-vulnerabilities.patch
+++ b/debian/patches/CVE-2013-2298-Scheduler-fix-security-vulnerabilities.patch
@@ -22,14 +22,16 @@ Subject: [PATCH] - Scheduler: fix security vulnerabilities
unsigned char uc = c;
if (isspace(uc)) continue;
first_char = c;
-@@ -510,13 +510,16 @@ bool XML_PARSER::scan_nonws(int& first_c
- #define XML_PARSE_CDATA 3
- #define XML_PARSE_TAG 4
- #define XML_PARSE_DATA 5
-+#define XML_PARSE_OVERFLOW 6
-+
-+#define TAG_BUF_LEN 256
+@@ -505,18 +505,12 @@ bool XML_PARSER::scan_nonws(int& first_c
+ }
+ }
+-#define XML_PARSE_COMMENT 1
+-#define XML_PARSE_EOF 2
+-#define XML_PARSE_CDATA 3
+-#define XML_PARSE_TAG 4
+-#define XML_PARSE_DATA 5
+-
int XML_PARSER::scan_comment() {
char buf[256];
char* p = buf;
@@ -40,7 +42,7 @@ Subject: [PATCH] - Scheduler: fix security vulnerabilities
*p++ = c;
*p = 0;
if (strstr(buf, "-->")) {
-@@ -534,7 +537,7 @@ int XML_PARSER::scan_cdata(char* buf, in
+@@ -534,7 +528,7 @@ int XML_PARSER::scan_cdata(char* buf, in
len--;
while (1) {
int c = f->_getc();
@@ -49,7 +51,7 @@ Subject: [PATCH] - Scheduler: fix security vulnerabilities
if (len) {
*p++ = c;
len--;
-@@ -571,7 +574,7 @@ int XML_PARSER::scan_tag(
+@@ -571,7 +565,7 @@ int XML_PARSER::scan_tag(
for (int i=0; ; i++) {
c = f->_getc();
@@ -58,7 +60,7 @@ Subject: [PATCH] - Scheduler: fix security vulnerabilities
if (c == '>') {
*buf = 0;
if (attr_buf) *attr_buf = 0;
-@@ -587,6 +590,8 @@ int XML_PARSER::scan_tag(
+@@ -587,6 +581,8 @@ int XML_PARSER::scan_tag(
} else if (c == '/') {
if (--tag_len > 0) {
*buf++ = c;
@@ -67,7 +69,7 @@ Subject: [PATCH] - Scheduler: fix security vulnerabilities
}
} else {
if (found_space) {
-@@ -598,6 +603,8 @@ int XML_PARSER::scan_tag(
+@@ -598,6 +594,8 @@ int XML_PARSER::scan_tag(
} else {
if (--tag_len > 0) {
*buf++ = c;
@@ -76,7 +78,7 @@ Subject: [PATCH] - Scheduler: fix security vulnerabilities
}
}
}
-@@ -615,21 +622,22 @@ int XML_PARSER::scan_tag(
+@@ -615,21 +613,22 @@ int XML_PARSER::scan_tag(
// read and copy text to buf; stop when find a <;
// ungetc() that so we read it again
@@ -105,7 +107,7 @@ Subject: [PATCH] - Scheduler: fix security vulnerabilities
}
}
-@@ -647,12 +655,12 @@ int XML_PARSER::get_aux(char* buf, int l
+@@ -647,12 +646,12 @@ int XML_PARSER::get_aux(char* buf, int l
if (c == '<') {
retval = scan_tag(buf, len, attr_buf, attr_len);
if (retval == XML_PARSE_EOF) return retval;
@@ -121,7 +123,7 @@ Subject: [PATCH] - Scheduler: fix security vulnerabilities
}
strip_whitespace(buf);
return retval;
-@@ -663,7 +671,9 @@ bool XML_PARSER::get(
+@@ -663,7 +662,9 @@ bool XML_PARSER::get(
char* buf, int len, bool& _is_tag, char* attr_buf, int attr_len
) {
switch (get_aux(buf, len, attr_buf, attr_len)) {
@@ -132,7 +134,7 @@ Subject: [PATCH] - Scheduler: fix security vulnerabilities
case XML_PARSE_TAG:
_is_tag = true;
break;
-@@ -685,11 +695,12 @@ bool XML_PARSER::get(
+@@ -685,11 +686,12 @@ bool XML_PARSER::get(
//
bool XML_PARSER::parse_str(const char* start_tag, char* buf, int len) {
bool eof;
@@ -147,7 +149,7 @@ Subject: [PATCH] - Scheduler: fix security vulnerabilities
if (parsed_tag[n-1] == '/') {
strcpy(tag, parsed_tag);
tag[n-1] = 0;
-@@ -745,7 +756,7 @@ bool XML_PARSER::parse_string(const char
+@@ -745,7 +747,7 @@ bool XML_PARSER::parse_string(const char
bool XML_PARSER::parse_int(const char* start_tag, int& i) {
char buf[256], *end;
bool eof;
@@ -156,7 +158,7 @@ Subject: [PATCH] - Scheduler: fix security vulnerabilities
if (strcmp(parsed_tag, start_tag)) return false;
-@@ -780,7 +791,7 @@ bool XML_PARSER::parse_int(const char* s
+@@ -780,7 +782,7 @@ bool XML_PARSER::parse_int(const char* s
bool XML_PARSER::parse_double(const char* start_tag, double& x) {
char buf[256], *end;
bool eof;
@@ -165,7 +167,7 @@ Subject: [PATCH] - Scheduler: fix security vulnerabilities
if (strcmp(parsed_tag, start_tag)) return false;
-@@ -815,7 +826,7 @@ bool XML_PARSER::parse_double(const char
+@@ -815,7 +817,7 @@ bool XML_PARSER::parse_double(const char
bool XML_PARSER::parse_ulong(const char* start_tag, unsigned long& x) {
char buf[256], *end;
bool eof;
@@ -174,7 +176,7 @@ Subject: [PATCH] - Scheduler: fix security vulnerabilities
if (strcmp(parsed_tag, start_tag)) return false;
-@@ -850,7 +861,7 @@ bool XML_PARSER::parse_ulong(const char*
+@@ -850,7 +852,7 @@ bool XML_PARSER::parse_ulong(const char*
bool XML_PARSER::parse_ulonglong(const char* start_tag, unsigned long long& x) {
char buf[256], *end;
bool eof;
@@ -183,7 +185,7 @@ Subject: [PATCH] - Scheduler: fix security vulnerabilities
if (strcmp(parsed_tag, start_tag)) return false;
-@@ -885,7 +896,7 @@ bool XML_PARSER::parse_ulonglong(const c
+@@ -885,7 +887,7 @@ bool XML_PARSER::parse_ulonglong(const c
bool XML_PARSER::parse_bool(const char* start_tag, bool& b) {
char buf[256], *end;
bool eof;
@@ -192,7 +194,7 @@ Subject: [PATCH] - Scheduler: fix security vulnerabilities
// handle the archaic form <tag/>, which means true
//
-@@ -919,7 +930,7 @@ bool XML_PARSER::parse_bool(const char*
+@@ -919,7 +921,7 @@ bool XML_PARSER::parse_bool(const char*
// parse a start tag (optionally preceded by <?xml>)
//
bool XML_PARSER::parse_start(const char* start_tag) {
@@ -201,7 +203,7 @@ Subject: [PATCH] - Scheduler: fix security vulnerabilities
bool eof;
eof = get(tag, sizeof(tag), is_tag);
-@@ -951,7 +962,7 @@ int XML_PARSER::element_contents(const c
+@@ -951,7 +953,7 @@ int XML_PARSER::element_contents(const c
break;
}
int c = f->_getc();
@@ -210,7 +212,7 @@ Subject: [PATCH] - Scheduler: fix security vulnerabilities
retval = ERR_XML_PARSE;
break;
}
-@@ -998,7 +1009,7 @@ int XML_PARSER::element_contents(const c
+@@ -998,7 +1000,7 @@ int XML_PARSER::element_contents(const c
void XML_PARSER::skip_unexpected(
const char* start_tag, bool verbose, const char* where
) {
@@ -219,7 +221,7 @@ Subject: [PATCH] - Scheduler: fix security vulnerabilities
if (verbose) {
fprintf(stderr, "Unrecognized XML in %s: %s\n", where, start_tag);
-@@ -1019,7 +1030,7 @@ void XML_PARSER::skip_unexpected(
+@@ -1019,7 +1021,7 @@ void XML_PARSER::skip_unexpected(
// copy this entire element, including start and end tags, to the buffer
//
int XML_PARSER::copy_element(string& out) {
@@ -230,7 +232,23 @@ Subject: [PATCH] - Scheduler: fix security vulnerabilities
//
--- a/lib/parse.h
+++ b/lib/parse.h
-@@ -44,7 +44,13 @@ public:
+@@ -28,6 +28,15 @@
+
+ // see parse_test.cpp for example usage of XML_PARSER
+
++#define XML_PARSE_COMMENT 1
++#define XML_PARSE_EOF 2
++#define XML_PARSE_CDATA 3
++#define XML_PARSE_TAG 4
++#define XML_PARSE_DATA 5
++#define XML_PARSE_OVERFLOW 6
++
++#define TAG_BUF_LEN 256
++
+ class XML_PARSER {
+ bool scan_nonws(int&);
+ int scan_comment();
+@@ -44,7 +53,13 @@ public:
}
bool get(char*, int, bool&, char* ab=0, int al=0);
inline bool get_tag(char* ab=0, int al=0) {
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list