diff options
| author | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-01-20 19:47:11 +0000 |
|---|---|---|
| committer | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-01-20 19:47:11 +0000 |
| commit | d74a60a6ae450520aa8cb467699d7529f10417a2 (patch) | |
| tree | 6a0d422467ec4830d267d04b66b00f52a4b9dcfc | |
| parent | eac419a73d6742fa2209f7e775c8624e9d863973 (diff) | |
Merge changes and update .version and ChangeLog files.
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.8.2.2@303104 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | .version | 2 | ||||
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | asterisk-1.8.2.1-summary.html | 60 | ||||
| -rw-r--r-- | asterisk-1.8.2.1-summary.txt | 88 | ||||
| -rw-r--r-- | main/utils.c | 21 |
5 files changed, 19 insertions, 160 deletions
@@ -1 +1 @@ -1.8.2.1 +1.8.2.2 @@ -1,3 +1,11 @@ +2011-01-20 Leif Madsen <lmadsen@digium.com> + + * Asterisk 1.8.2.2 Released. + + * An improper merge of the changes for AST-2011-011 caused the changes + to not be applied to the 1.8.2.1 tag. The 1.8.2.2 tag contains the + security changes related to AST-2011-001. + 2011-01-17 Leif Madsen <lmadsen@digium.com> * Asterisk 1.8.2.1 Released. diff --git a/asterisk-1.8.2.1-summary.html b/asterisk-1.8.2.1-summary.html deleted file mode 100644 index 85bdd5a60..000000000 --- a/asterisk-1.8.2.1-summary.html +++ /dev/null @@ -1,60 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>Release Summary - asterisk-1.8.2.1</title></head> -<body> -<h1 align="center"><a name="top">Release Summary</a></h1> -<h3 align="center">asterisk-1.8.2.1</h3> -<h3 align="center">Date: 2011-01-17</h3> -<h3 align="center"><asteriskteam@digium.com></h3> -<hr/> -<h2 align="center">Table of Contents</h2> -<ol> - <li><a href="#summary">Summary</a></li> - <li><a href="#contributors">Contributors</a></li> - <li><a href="#commits">Other Changes</a></li> - <li><a href="#diffstat">Diffstat</a></li> -</ol> -<hr/> -<a name="summary"><h2 align="center">Summary</h2></a> -<center><a href="#top">[Back to Top]</a></center><br/><p>This release has been made to address one or more security vulnerabilities that have been identified. A security advisory document has been published for each vulnerability that includes additional information. Users of versions of Asterisk that are affected are strongly encouraged to review the advisories and determine what action they should take to protect their systems from these issues.</p> -<p>Security Advisories: <a href="http://downloads.asterisk.org/pub/security/AST-2011-001.html">AST-2011-001</a></p> -<p>The data in this summary reflects changes that have been made since the previous release, asterisk-1.8.2.</p> -<hr/> -<a name="contributors"><h2 align="center">Contributors</h2></a> -<center><a href="#top">[Back to Top]</a></center><br/><p>This table lists the people who have submitted code, those that have tested patches, as well as those that reported issues on the issue tracker that were resolved in this release. For coders, the number is how many of their patches (of any size) were committed into this release. For testers, the number is the number of times their name was listed as assisting with testing a patch. Finally, for reporters, the number is the number of issues that they reported that were closed by commits that went into this release.</p> -<table width="100%" border="0"> -<tr> -<td width="33%"><h3>Coders</h3></td> -<td width="33%"><h3>Testers</h3></td> -<td width="33%"><h3>Reporters</h3></td> -</tr> -<tr valign="top"> -<td> -2 lmadsen<br/> -</td> -<td> -</td> -<td> -</td> -</tr> -</table> -<hr/> -<a name="commits"><h2 align="center">Commits Not Associated with an Issue</h2></a> -<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all changes that went into this release that did not directly close an issue from the issue tracker. The commits may have been marked as being related to an issue. If that is the case, the issue numbers are listed here, as well.</p> -<table width="100%" border="1"> -<tr><td><b>Revision</b></td><td><b>Author</b></td><td><b>Summary</b></td><td><b>Issues Referenced</b></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/tags/1.8.2.1?view=revision&revision=302106">302106</a></td><td>lmadsen</td><td>Create 1.8.2.1 from 1.8.2</td> -<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/tags/1.8.2.1?view=revision&revision=302150">302150</a></td><td>lmadsen</td><td>AST-2011-001</td> -<td></td></tr></table> -<hr/> -<a name="diffstat"><h2 align="center">Diffstat Results</h2></a> -<center><a href="#top">[Back to Top]</a></center><br/><p>This is a summary of the changes to the source code that went into this release that was generated using the diffstat utility.</p> -<pre> -.version | 2 -ChangeLog | 6 -asterisk-1.8.2-summary.html | 365 -------------------------------- -asterisk-1.8.2-summary.txt | 489 -------------------------------------------- -4 files changed, 7 insertions(+), 855 deletions(-) -</pre><br/> -<hr/> -</body> -</html> diff --git a/asterisk-1.8.2.1-summary.txt b/asterisk-1.8.2.1-summary.txt deleted file mode 100644 index a2d1fea4c..000000000 --- a/asterisk-1.8.2.1-summary.txt +++ /dev/null @@ -1,88 +0,0 @@ - Release Summary - - asterisk-1.8.2.1 - - Date: 2011-01-17 - - <asteriskteam@digium.com> - - ---------------------------------------------------------------------- - - Table of Contents - - 1. Summary - 2. Contributors - 3. Other Changes - 4. Diffstat - - ---------------------------------------------------------------------- - - Summary - - [Back to Top] - - This release has been made to address one or more security vulnerabilities - that have been identified. A security advisory document has been published - for each vulnerability that includes additional information. Users of - versions of Asterisk that are affected are strongly encouraged to review - the advisories and determine what action they should take to protect their - systems from these issues. - - Security Advisories: AST-2011-001 - - The data in this summary reflects changes that have been made since the - previous release, asterisk-1.8.2. - - ---------------------------------------------------------------------- - - Contributors - - [Back to Top] - - This table lists the people who have submitted code, those that have - tested patches, as well as those that reported issues on the issue tracker - that were resolved in this release. For coders, the number is how many of - their patches (of any size) were committed into this release. For testers, - the number is the number of times their name was listed as assisting with - testing a patch. Finally, for reporters, the number is the number of - issues that they reported that were closed by commits that went into this - release. - - Coders Testers Reporters - 2 lmadsen - - ---------------------------------------------------------------------- - - Commits Not Associated with an Issue - - [Back to Top] - - This is a list of all changes that went into this release that did not - directly close an issue from the issue tracker. The commits may have been - marked as being related to an issue. If that is the case, the issue - numbers are listed here, as well. - - +------------------------------------------------------------------------+ - | Revision | Author | Summary | Issues Referenced | - |-----------+----------+----------------------------+--------------------| - | 302106 | lmadsen | Create 1.8.2.1 from 1.8.2 | | - |-----------+----------+----------------------------+--------------------| - | 302150 | lmadsen | AST-2011-001 | | - +------------------------------------------------------------------------+ - - ---------------------------------------------------------------------- - - Diffstat Results - - [Back to Top] - - This is a summary of the changes to the source code that went into this - release that was generated using the diffstat utility. - - .version | 2 - ChangeLog | 6 - asterisk-1.8.2-summary.html | 365 -------------------------------- - asterisk-1.8.2-summary.txt | 489 -------------------------------------------- - 4 files changed, 7 insertions(+), 855 deletions(-) - - ---------------------------------------------------------------------- diff --git a/main/utils.c b/main/utils.c index 6f2c884d0..2617669db 100644 --- a/main/utils.c +++ b/main/utils.c @@ -383,33 +383,32 @@ static void base64_init(void) char *ast_uri_encode(const char *string, char *outbuf, int buflen, int do_special_char) { const char *ptr = string; /* Start with the string */ - char *out = NULL; - char *buf = NULL; + char *out = outbuf; const char *mark = "-_.!~*'()"; /* no encode set, RFC 2396 section 2.3, RFC 3261 sec 25 */ - ast_copy_string(outbuf, string, buflen); - while (*ptr) { + while (*ptr && out - outbuf < buflen - 1) { if ((const signed char) *ptr < 32 || *ptr == 0x7f || *ptr == '%' || (do_special_char && !(*ptr >= '0' && *ptr <= '9') && /* num */ !(*ptr >= 'A' && *ptr <= 'Z') && /* ALPHA */ !(*ptr >= 'a' && *ptr <= 'z') && /* alpha */ !strchr(mark, *ptr))) { /* mark set */ - - /* Oops, we need to start working here */ - if (!buf) { - buf = outbuf; - out = buf + (ptr - string) ; /* Set output ptr */ + if (out - outbuf >= buflen - 3) { + break; } + out += sprintf(out, "%%%02X", (unsigned char) *ptr); - } else if (buf) { + } else { *out = *ptr; /* Continue copying the string */ out++; } ptr++; } - if (buf) + + if (buflen) { *out = '\0'; + } + return outbuf; } |