sha
string | github
string | commit_message
string | git_diff
string | is_security
int64 |
|---|---|---|---|---|
164fb2d23a0894b726b72a047d34191d64a18104
|
https://github.com/kyz/libmspack/commit/164fb2d23a0894b726b72a047d34191d64a18104
|
remove obsolete Doxygen config
|
diff --git a/libmspack/trunk/doc/Doxyfile.in b/libmspack/trunk/doc/Doxyfile.in
index 820f66e..56d70ad 100644
--- a/libmspack/trunk/doc/Doxyfile.in
+++ b/libmspack/trunk/doc/Doxyfile.in
@@ -9,8 +9,6 @@ OPTIMIZE_OUTPUT_FOR_C = YES
SHOW_USED_FILES = YES
INPUT = @top_srcdir@/mspack/mspack.h
FULL_PATH_NAMES = NO
-OPTIMIZE_FOR_C = YES
-12a15
GENERATE_HTML = YES
HTML_OUTPUT = .
HTML_FILE_EXTENSION = .html
| 0
|
4132a3d489b12d256e10eb8e55d2e8477969c0a2
|
https://github.com/wernerd/ZRTPCPP/commit/4132a3d489b12d256e10eb8e55d2e8477969c0a2
|
Small fix to cleanup the build directory
|
diff --git a/buildNativeAndroidTivi.sh b/buildNativeAndroidTivi.sh
index 46838f6..1ed2f03 100644
--- a/buildNativeAndroidTivi.sh
+++ b/buildNativeAndroidTivi.sh
@@ -41,6 +41,9 @@ fi
cp obj/local/armeabi-v7a/libzrtpcpp.a ${WORKSPACE}/silentphone2/jni/armeabi-v7a/
+popd
+popd
+
# cleanup build directory
rm -rf buildTiviAndroid
exit 0
| 0
|
bef9a9b318ab7032ea5a0d9c045ebb6dbb266545
|
https://github.com/GStreamer/gst-plugins-ugly/commit/bef9a9b318ab7032ea5a0d9c045ebb6dbb266545
|
docs: Update plugins cache
|
diff --git a/docs/gst_plugins_cache.json b/docs/gst_plugins_cache.json
index 919ad4b3..328f6f94 100644
--- a/docs/gst_plugins_cache.json
+++ b/docs/gst_plugins_cache.json
@@ -35,7 +35,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -47,7 +47,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -61,7 +61,7 @@
"default": "0",
"max": "9223372036854775807",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gint64",
"writable": true
@@ -73,7 +73,7 @@
"construct-only": false,
"controllable": false,
"default": " (0)",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "GstA52DecMode",
"writable": true
@@ -85,7 +85,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -99,7 +99,7 @@
"default": "0",
"max": "9223372036854775807",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gint64",
"writable": true
@@ -200,7 +200,7 @@
"default": "0",
"max": "9223372036854775807",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gint64",
"writable": true
@@ -212,7 +212,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -226,7 +226,7 @@
"default": "0",
"max": "9223372036854775807",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gint64",
"writable": true
@@ -238,7 +238,7 @@
"construct-only": false,
"controllable": false,
"default": "IF1 (0)",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "GstAmrnbVariant",
"writable": true
@@ -282,7 +282,7 @@
"construct-only": false,
"controllable": false,
"default": "MR122 (7)",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "GstAmrnbEncBandMode",
"writable": true
@@ -294,7 +294,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -306,7 +306,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": false
@@ -318,7 +318,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -332,7 +332,7 @@
"default": "40000000",
"max": "9223372036854775807",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gint64",
"writable": true
@@ -453,7 +453,7 @@
"default": "0",
"max": "9223372036854775807",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gint64",
"writable": true
@@ -465,7 +465,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -479,7 +479,7 @@
"default": "0",
"max": "9223372036854775807",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gint64",
"writable": true
@@ -592,7 +592,7 @@
"default": "100",
"max": "2147483647",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gint",
"writable": true
@@ -604,7 +604,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -616,7 +616,7 @@
"construct-only": false,
"controllable": false,
"default": "application/x-rtp-depayload-stats, clock_rate=(uint)0, npt-start=(guint64)0, npt-stop=(guint64)18446744073709551615, play-speed=(double)1, play-scale=(double)1, running-time-dts=(guint64)18446744073709551615, running-time-pts=(guint64)18446744073709551615, seqnum=(uint)0, timestamp=(uint)0;",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "GstStructure",
"writable": false
@@ -688,7 +688,7 @@
"default": "4096",
"max": "-1",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "guint",
"writable": true
@@ -700,7 +700,7 @@
"construct-only": false,
"controllable": false,
"default": "/dev/cdrom",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gchararray",
"writable": true
@@ -712,7 +712,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -724,7 +724,7 @@
"construct-only": false,
"controllable": false,
"default": "normal (0)",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "GstAudioCdSrcMode",
"writable": true
@@ -738,7 +738,7 @@
"default": "-1",
"max": "2147483647",
"min": "-1",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gint",
"writable": true
@@ -752,7 +752,7 @@
"default": "-1",
"max": "100",
"min": "-1",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gint",
"writable": true
@@ -766,7 +766,7 @@
"default": "1",
"max": "99",
"min": "1",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "guint",
"writable": true
@@ -778,7 +778,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -833,7 +833,7 @@
"default": "0",
"max": "9223372036854775807",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gint64",
"writable": true
@@ -845,7 +845,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -859,7 +859,7 @@
"default": "0",
"max": "9223372036854775807",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gint64",
"writable": true
@@ -913,7 +913,7 @@
"default": "1",
"max": "999",
"min": "1",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gint",
"writable": true
@@ -927,7 +927,7 @@
"default": "4096",
"max": "-1",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "guint",
"writable": true
@@ -941,7 +941,7 @@
"default": "1",
"max": "999",
"min": "1",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gint",
"writable": true
@@ -953,7 +953,7 @@
"construct-only": false,
"controllable": false,
"default": "/dev/dvd",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gchararray",
"writable": true
@@ -965,7 +965,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -979,7 +979,7 @@
"default": "-1",
"max": "2147483647",
"min": "-1",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gint",
"writable": true
@@ -993,7 +993,7 @@
"default": "1",
"max": "999",
"min": "1",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gint",
"writable": true
@@ -1005,7 +1005,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -1122,7 +1122,7 @@
"construct-only": false,
"controllable": false,
"default": "true",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -1176,7 +1176,7 @@
"default": "4096",
"max": "-1",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "guint",
"writable": true
@@ -1188,7 +1188,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -1200,7 +1200,7 @@
"construct-only": false,
"controllable": false,
"default": "NULL",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gchararray",
"writable": true
@@ -1214,7 +1214,7 @@
"default": "-1",
"max": "2147483647",
"min": "-1",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gint",
"writable": true
@@ -1226,7 +1226,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -1357,7 +1357,7 @@
"default": "200",
"max": "-1",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "guint",
"writable": true
@@ -1750,7 +1750,7 @@
"construct-only": false,
"controllable": false,
"default": "(none)",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "GstX264EncAnalyse",
"writable": true
@@ -1762,7 +1762,7 @@
"construct-only": false,
"controllable": false,
"default": "true",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -1774,7 +1774,7 @@
"construct-only": false,
"controllable": false,
"default": "true",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -1786,7 +1786,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -1800,7 +1800,7 @@
"default": "0",
"max": "16",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "guint",
"writable": true
@@ -1826,7 +1826,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -1838,7 +1838,7 @@
"construct-only": false,
"controllable": false,
"default": "true",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -1850,7 +1850,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -1862,7 +1862,7 @@
"construct-only": false,
"controllable": false,
"default": "auto (-1)",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "GstX264EncFramePacking",
"writable": true
@@ -1874,7 +1874,7 @@
"construct-only": false,
"controllable": false,
"default": "true",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -1886,7 +1886,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -1898,7 +1898,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -1912,7 +1912,7 @@
"default": "1.4",
"max": "2",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gfloat",
"writable": true
@@ -1926,7 +1926,7 @@
"default": "0",
"max": "2147483647",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "guint",
"writable": true
@@ -1938,7 +1938,7 @@
"construct-only": false,
"controllable": false,
"default": "true",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -1950,7 +1950,7 @@
"construct-only": false,
"controllable": false,
"default": "hex (1)",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "GstX264EncMe",
"writable": true
@@ -1964,7 +1964,7 @@
"default": "0",
"max": "18446744073709551615",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "guint64",
"writable": true
@@ -1976,7 +1976,7 @@
"construct-only": false,
"controllable": false,
"default": "x264.log",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gchararray",
"writable": true
@@ -1990,7 +1990,7 @@
"default": "0",
"max": "100000",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "guint",
"writable": true
@@ -2002,7 +2002,7 @@
"construct-only": false,
"controllable": false,
"default": "",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gchararray",
"writable": true
@@ -2014,7 +2014,7 @@
"construct-only": false,
"controllable": false,
"default": "cbr (0)",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "GstX264EncPass",
"writable": true
@@ -2028,7 +2028,7 @@
"default": "1.3",
"max": "2",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gfloat",
"writable": true
@@ -2040,7 +2040,7 @@
"construct-only": false,
"controllable": false,
"default": "none (0)",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "GstX264EncPsyTune",
"writable": true
@@ -2052,7 +2052,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -2066,7 +2066,7 @@
"default": "51",
"max": "51",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "guint",
"writable": true
@@ -2080,7 +2080,7 @@
"default": "10",
"max": "51",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "guint",
"writable": true
@@ -2094,7 +2094,7 @@
"default": "4",
"max": "50",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "guint",
"writable": true
@@ -2108,7 +2108,7 @@
"default": "21",
"max": "50",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "guint",
"writable": true
@@ -2122,7 +2122,7 @@
"default": "40",
"max": "250",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gint",
"writable": true
@@ -2136,7 +2136,7 @@
"default": "3",
"max": "16",
"min": "1",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "guint",
"writable": true
@@ -2148,7 +2148,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -2160,7 +2160,7 @@
"construct-only": false,
"controllable": false,
"default": "medium (6)",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "GstX264EncPreset",
"writable": true
@@ -2174,7 +2174,7 @@
"default": "0",
"max": "31",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "guint",
"writable": true
@@ -2188,7 +2188,7 @@
"default": "1",
"max": "10",
"min": "1",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "guint",
"writable": true
@@ -2202,7 +2202,7 @@
"default": "-1",
"max": "250",
"min": "-1",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gint",
"writable": true
@@ -2216,7 +2216,7 @@
"default": "0",
"max": "2147483647",
"min": "0",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "guint",
"writable": true
@@ -2228,7 +2228,7 @@
"construct-only": false,
"controllable": false,
"default": "true",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
@@ -2240,7 +2240,7 @@
"construct-only": false,
"controllable": false,
"default": "(none)",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "GstX264EncTune",
"writable": true
@@ -2266,7 +2266,7 @@
"construct-only": false,
"controllable": false,
"default": "false",
- "mutable": "playing",
+ "mutable": "null",
"readable": true,
"type": "gboolean",
"writable": true
| 0
|
89d2218578f995ec512dd7146f983e60ba15bc65
|
https://github.com/josephernest/void/commit/89d2218578f995ec512dd7146f983e60ba15bc65
|
Update index.php
|
diff --git a/index.php b/index.php
index 3fdec34..59df34d 100644
--- a/index.php
+++ b/index.php
@@ -80,7 +80,7 @@ function getpage($page)
</div>
<div class="footer">
<div class="left"><a href="">© <?php echo date('Y') . " " . $sitename; ?></a></div>
- <div class="right">Powered by <a href="http://www.thisisvoid.org">Void</a>.</div>
+ <div class="right">Powered by <a href="https://github.com/josephernest/void">Void</a>.</div>
</div>
</body>
</html>
| 0
|
e28dd578fad90a6d5726ec34f3245c9f99d909a5
|
https://github.com/apache/tomcat/commit/e28dd578fad90a6d5726ec34f3245c9f99d909a5
|
Add a new limit, defaulting to 2MB, for the amount of data Tomcat will swallow for an aborted upload.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1603770 13f79535-47bb-0310-9956-ffa450edef68
|
diff --git a/java/org/apache/coyote/http11/AbstractHttp11Processor.java b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
index 1430ceae8d5..b22349ffcd7 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11Processor.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
@@ -647,14 +647,15 @@ protected boolean statusDropsConnection(int status) {
/**
* Initialize standard input and output filters.
*/
- protected void initializeFilters(int maxTrailerSize, int maxExtensionSize) {
+ protected void initializeFilters(int maxTrailerSize, int maxExtensionSize,
+ int maxSwallowSize) {
// Create and add the identity filters.
- getInputBuffer().addFilter(new IdentityInputFilter());
+ getInputBuffer().addFilter(new IdentityInputFilter(maxSwallowSize));
getOutputBuffer().addFilter(new IdentityOutputFilter());
// Create and add the chunked filters.
getInputBuffer().addFilter(
- new ChunkedInputFilter(maxTrailerSize, maxExtensionSize));
+ new ChunkedInputFilter(maxTrailerSize, maxExtensionSize, maxSwallowSize));
getOutputBuffer().addFilter(new ChunkedOutputFilter());
// Create and add the void filters.
diff --git a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
index a31091cd9fc..3be34741e6e 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
@@ -154,6 +154,16 @@ public void setMaxExtensionSize(int maxExtensionSize) {
}
+ /**
+ * Maximum amount of request body to swallow.
+ */
+ private int maxSwallowSize = 2 * 1024 * 1024;
+ public int getMaxSwallowSize() { return maxSwallowSize; }
+ public void setMaxSwallowSize(int maxSwallowSize) {
+ this.maxSwallowSize = maxSwallowSize;
+ }
+
+
/**
* This field indicates if the protocol is treated as if it is secure. This
* normally means https is being used but can be used to fake https e.g
diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java
index 08a7f27cac8..e4ecd1a3708 100644
--- a/java/org/apache/coyote/http11/Http11AprProcessor.java
+++ b/java/org/apache/coyote/http11/Http11AprProcessor.java
@@ -59,7 +59,7 @@ protected Log getLog() {
public Http11AprProcessor(int headerBufferSize, AprEndpoint endpoint,
- int maxTrailerSize, int maxExtensionSize) {
+ int maxTrailerSize, int maxExtensionSize, int maxSwallowSize) {
super(endpoint);
@@ -69,7 +69,7 @@ public Http11AprProcessor(int headerBufferSize, AprEndpoint endpoint,
outputBuffer = new InternalAprOutputBuffer(response, headerBufferSize);
response.setOutputBuffer(outputBuffer);
- initializeFilters(maxTrailerSize, maxExtensionSize);
+ initializeFilters(maxTrailerSize, maxExtensionSize, maxSwallowSize);
}
diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java b/java/org/apache/coyote/http11/Http11AprProtocol.java
index 024e93dbae1..d32b0073f9a 100644
--- a/java/org/apache/coyote/http11/Http11AprProtocol.java
+++ b/java/org/apache/coyote/http11/Http11AprProtocol.java
@@ -319,7 +319,8 @@ protected void longPoll(SocketWrapper<Long> socket,
protected Http11AprProcessor createProcessor() {
Http11AprProcessor processor = new Http11AprProcessor(
proto.getMaxHttpHeaderSize(), (AprEndpoint)proto.endpoint,
- proto.getMaxTrailerSize(), proto.getMaxExtensionSize());
+ proto.getMaxTrailerSize(), proto.getMaxExtensionSize(),
+ proto.getMaxSwallowSize());
processor.setAdapter(proto.getAdapter());
processor.setMaxKeepAliveRequests(proto.getMaxKeepAliveRequests());
processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
diff --git a/java/org/apache/coyote/http11/Http11Nio2Processor.java b/java/org/apache/coyote/http11/Http11Nio2Processor.java
index d9ea12fc4ce..c57c87e3e2a 100644
--- a/java/org/apache/coyote/http11/Http11Nio2Processor.java
+++ b/java/org/apache/coyote/http11/Http11Nio2Processor.java
@@ -60,7 +60,7 @@ protected Log getLog() {
public Http11Nio2Processor(int maxHttpHeaderSize, Nio2Endpoint endpoint,
- int maxTrailerSize, int maxExtensionSize) {
+ int maxTrailerSize, int maxExtensionSize, int maxSwallowSize) {
super(endpoint);
@@ -70,7 +70,7 @@ public Http11Nio2Processor(int maxHttpHeaderSize, Nio2Endpoint endpoint,
outputBuffer = new InternalNio2OutputBuffer(response, maxHttpHeaderSize);
response.setOutputBuffer(outputBuffer);
- initializeFilters(maxTrailerSize, maxExtensionSize);
+ initializeFilters(maxTrailerSize, maxExtensionSize, maxSwallowSize);
}
diff --git a/java/org/apache/coyote/http11/Http11Nio2Protocol.java b/java/org/apache/coyote/http11/Http11Nio2Protocol.java
index 94465581f0e..3e02a8d1643 100644
--- a/java/org/apache/coyote/http11/Http11Nio2Protocol.java
+++ b/java/org/apache/coyote/http11/Http11Nio2Protocol.java
@@ -248,7 +248,8 @@ protected void longPoll(SocketWrapper<Nio2Channel> socket,
public Http11Nio2Processor createProcessor() {
Http11Nio2Processor processor = new Http11Nio2Processor(
proto.getMaxHttpHeaderSize(), (Nio2Endpoint) proto.endpoint,
- proto.getMaxTrailerSize(), proto.getMaxExtensionSize());
+ proto.getMaxTrailerSize(), proto.getMaxExtensionSize(),
+ proto.getMaxSwallowSize());
processor.setAdapter(proto.getAdapter());
processor.setMaxKeepAliveRequests(proto.getMaxKeepAliveRequests());
processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java
index c8d319c258a..30aa9e96973 100644
--- a/java/org/apache/coyote/http11/Http11NioProcessor.java
+++ b/java/org/apache/coyote/http11/Http11NioProcessor.java
@@ -63,7 +63,7 @@ protected Log getLog() {
public Http11NioProcessor(int maxHttpHeaderSize, NioEndpoint endpoint,
- int maxTrailerSize, int maxExtensionSize) {
+ int maxTrailerSize, int maxExtensionSize, int maxSwallowSize) {
super(endpoint);
@@ -73,7 +73,7 @@ public Http11NioProcessor(int maxHttpHeaderSize, NioEndpoint endpoint,
outputBuffer = new InternalNioOutputBuffer(response, maxHttpHeaderSize);
response.setOutputBuffer(outputBuffer);
- initializeFilters(maxTrailerSize, maxExtensionSize);
+ initializeFilters(maxTrailerSize, maxExtensionSize, maxSwallowSize);
}
diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java
index 77646d75ec0..585f44943f0 100644
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -280,7 +280,8 @@ protected void longPoll(SocketWrapper<NioChannel> socket,
public Http11NioProcessor createProcessor() {
Http11NioProcessor processor = new Http11NioProcessor(
proto.getMaxHttpHeaderSize(), (NioEndpoint)proto.endpoint,
- proto.getMaxTrailerSize(), proto.getMaxExtensionSize());
+ proto.getMaxTrailerSize(), proto.getMaxExtensionSize(),
+ proto.getMaxSwallowSize());
processor.setAdapter(proto.getAdapter());
processor.setMaxKeepAliveRequests(proto.getMaxKeepAliveRequests());
processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java
index ad58b78a2d9..98f8dbad163 100644
--- a/java/org/apache/coyote/http11/Http11Processor.java
+++ b/java/org/apache/coyote/http11/Http11Processor.java
@@ -49,7 +49,7 @@ protected Log getLog() {
public Http11Processor(int headerBufferSize, JIoEndpoint endpoint,
- int maxTrailerSize, int maxExtensionSize) {
+ int maxTrailerSize, int maxExtensionSize, int maxSwallowSize) {
super(endpoint);
@@ -59,7 +59,7 @@ public Http11Processor(int headerBufferSize, JIoEndpoint endpoint,
outputBuffer = new InternalOutputBuffer(response, headerBufferSize);
response.setOutputBuffer(outputBuffer);
- initializeFilters(maxTrailerSize, maxExtensionSize);
+ initializeFilters(maxTrailerSize, maxExtensionSize, maxSwallowSize);
}
diff --git a/java/org/apache/coyote/http11/Http11Protocol.java b/java/org/apache/coyote/http11/Http11Protocol.java
index 81e8fa3fab3..8f13aced691 100644
--- a/java/org/apache/coyote/http11/Http11Protocol.java
+++ b/java/org/apache/coyote/http11/Http11Protocol.java
@@ -186,7 +186,8 @@ protected void longPoll(SocketWrapper<Socket> socket,
protected Http11Processor createProcessor() {
Http11Processor processor = new Http11Processor(
proto.getMaxHttpHeaderSize(), (JIoEndpoint)proto.endpoint,
- proto.getMaxTrailerSize(),proto.getMaxExtensionSize());
+ proto.getMaxTrailerSize(),proto.getMaxExtensionSize(),
+ proto.getMaxSwallowSize());
processor.setAdapter(proto.getAdapter());
processor.setMaxKeepAliveRequests(proto.getMaxKeepAliveRequests());
processor.setKeepAliveTimeout(proto.getKeepAliveTimeout());
diff --git a/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java b/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
index f3315b58b76..e64aadb4375 100644
--- a/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
+++ b/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
@@ -137,6 +137,9 @@
private long extensionSize;
+ private final int maxSwallowSize;
+
+
/**
* Flag that indicates if an error has occurred.
*/
@@ -145,10 +148,11 @@
// ----------------------------------------------------------- Constructors
- public ChunkedInputFilter(int maxTrailerSize, int maxExtensionSize) {
+ public ChunkedInputFilter(int maxTrailerSize, int maxExtensionSize, int maxSwallowSize) {
this.trailingHeaders.setLimit(maxTrailerSize);
this.maxExtensionSize = maxExtensionSize;
this.maxTrailerSize = maxTrailerSize;
+ this.maxSwallowSize = maxSwallowSize;
}
@@ -234,9 +238,14 @@ public void setRequest(Request request) {
*/
@Override
public long end() throws IOException {
+ long swallowed = 0;
+ int read = 0;
// Consume extra bytes : parse the stream until the end chunk is found
- while (doRead(readChunk, null) >= 0) {
- // NOOP: Just consume the input
+ while ((read = doRead(readChunk, null)) >= 0) {
+ swallowed += read;
+ if (maxSwallowSize > -1 && swallowed > maxSwallowSize) {
+ throwIOException(sm.getString("inputFilter.maxSwallow"));
+ }
}
// Return the number of extra bytes which were consumed
diff --git a/java/org/apache/coyote/http11/filters/IdentityInputFilter.java b/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
index 35846177b84..c1e45bfd318 100644
--- a/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
+++ b/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
@@ -24,6 +24,7 @@
import org.apache.coyote.Request;
import org.apache.coyote.http11.InputFilter;
import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.res.StringManager;
/**
* Identity input filter.
@@ -32,6 +33,9 @@
*/
public class IdentityInputFilter implements InputFilter {
+ private static final StringManager sm = StringManager.getManager(
+ IdentityInputFilter.class.getPackage().getName());
+
// -------------------------------------------------------------- Constants
@@ -76,6 +80,14 @@
protected final ByteChunk endChunk = new ByteChunk();
+ private final int maxSwallowSize;
+
+
+ public IdentityInputFilter(int maxSwallowSize) {
+ this.maxSwallowSize = maxSwallowSize;
+ }
+
+
// ---------------------------------------------------- InputBuffer Methods
/**
@@ -137,8 +149,11 @@ public void setRequest(Request request) {
* End the current request.
*/
@Override
- public long end()
- throws IOException {
+ public long end() throws IOException {
+
+ if (maxSwallowSize > -1 && remaining > maxSwallowSize) {
+ throw new IOException(sm.getString("inputFilter.maxSwallow"));
+ }
// Consume extra bytes.
while (remaining > 0) {
diff --git a/java/org/apache/coyote/http11/filters/LocalStrings.properties b/java/org/apache/coyote/http11/filters/LocalStrings.properties
index b4723657f52..0542fb5f5e7 100644
--- a/java/org/apache/coyote/http11/filters/LocalStrings.properties
+++ b/java/org/apache/coyote/http11/filters/LocalStrings.properties
@@ -22,4 +22,6 @@ chunkedInputFilter.invalidCrlfNoCR=Invalid end of line sequence (No CR before LF
chunkedInputFilter.invalidCrlfNoData=Invalid end of line sequence (no data available to read)
chunkedInputFilter.invalidHeader=Invalid chunk header
chunkedInputFilter.maxExtension=maxExtensionSize exceeded
-chunkedInputFilter.maxTrailer=maxTrailerSize exceeded
\ No newline at end of file
+chunkedInputFilter.maxTrailer=maxTrailerSize exceeded
+
+inputFilter.maxSwallow=maxSwallowSize exceeded
\ No newline at end of file
diff --git a/test/org/apache/catalina/core/TestSwallowAbortedUploads.java b/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
index d97289cc468..f08f3d765a8 100644
--- a/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
+++ b/test/org/apache/catalina/core/TestSwallowAbortedUploads.java
@@ -16,8 +16,14 @@
*/
package org.apache.catalina.core;
+import java.io.BufferedReader;
import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.io.Writer;
+import java.net.Socket;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collection;
@@ -32,6 +38,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -113,7 +120,7 @@ public void testAbortedUploadLimitedSwallow() {
Exception ex = doAbortedUploadTest(client, true, true);
assertNull("Limited upload with swallow enabled generates client exception",
ex);
- assertTrue("Limited upload with swallow enabled returns error status code",
+ assertTrue("Limited upload with swallow enabled returns non-500 status code",
client.isResponse500());
client.reset();
}
@@ -400,4 +407,72 @@ public boolean isResponseBodyOK() {
}
}
+
+ @Test
+ public void testChunkedPUTLimit() throws Exception {
+ doTestChunkedPUT(true);
+ }
+
+
+ @Test
+ public void testChunkedPUTNoLimit() throws Exception {
+ doTestChunkedPUT(false);
+ }
+
+
+ public void doTestChunkedPUT(boolean limit) throws Exception {
+
+ Tomcat tomcat = getTomcatInstance();
+ tomcat.addContext("", TEMP_DIR);
+ // No need for target to exist.
+
+ if (!limit) {
+ tomcat.getConnector().setAttribute("maxSwallowSize", "-1");
+ }
+
+ tomcat.start();
+
+ Exception writeEx = null;
+ Exception readEx = null;
+ String responseLine = null;
+
+ try (Socket conn = new Socket("localhost", getPort())) {
+ Writer writer = new OutputStreamWriter(
+ conn.getOutputStream(), StandardCharsets.US_ASCII);
+ writer.write("PUT /does-not-exist HTTP/1.1\r\n");
+ writer.write("Host: any\r\n");
+ writer.write("Transfer-encoding: chunked\r\n");
+ writer.write("\r\n");
+
+ // Smarter than the typical client. Attempts to read the response
+ // even if the request is not fully written.
+ try {
+ // Write (or try to write) 16MB
+ for (int i = 0; i < 1024 * 1024; i++) {
+ writer.write("10\r\n");
+ writer.write("0123456789ABCDEF\r\n");
+ }
+ } catch (Exception e) {
+ writeEx = e;
+ }
+
+ try {
+ BufferedReader reader = new BufferedReader(new InputStreamReader(
+ conn.getInputStream(), StandardCharsets.US_ASCII));
+
+ responseLine = reader.readLine();
+ } catch (IOException e) {
+ readEx = e;
+ }
+ }
+
+ if (limit) {
+ Assert.assertNotNull(writeEx);
+ } else {
+ Assert.assertNull(writeEx);
+ }
+ Assert.assertNull(readEx);
+ Assert.assertNotNull(responseLine);
+ Assert.assertTrue(responseLine.contains("404"));
+ }
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 68ecf9d734d..d6748e031fb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -205,6 +205,10 @@
<fix>
Improve configuration of cache sizes in the endpoint. (markt)
</fix>
+ <add>
+ Add a new limit, defaulting to 2MB, for the amount of data Tomcat will
+ swallow for an aborted upload. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Jasper">
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index f29eda16fae..709b6b0dd0f 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -436,6 +436,16 @@
If not specified, this attribute is set to 100.</p>
</attribute>
+ <attribute name="maxSwallowSize" required="false">
+ <p>The maximum number of request body bytes (excluding transfer encoding
+ overhead) that will be swallowed by Tomcat for an aborted upload. An
+ aborted upload is when Tomcat knows that the request body is going to be
+ ignored but the client still sends it. If Tomcat does not swallow the body
+ the client is unlikely to see the response. If not specified the default
+ of 2097152 (2 megabytes) will be used. A value of less than zero indicates
+ that no limit should be enforced.</p>
+ </attribute>
+
<attribute name="maxThreads" required="false">
<p>The maximum number of request processing threads to be created
by this <strong>Connector</strong>, which therefore determines the
| 1
|
9092fd01e1f452f37c313d38b18f9fe6907541f9
|
https://github.com/WordPress/WordPress/commit/9092fd01e1f452f37c313d38b18f9fe6907541f9
|
Taxonomy: Correct the formatting of HTML entities when generating the screen reader text for tag removal.
Props adamsilverstein
Built from https://develop.svn.wordpress.org/trunk@40181
git-svn-id: http://core.svn.wordpress.org/trunk@40120 1a063a9b-81f0-0310-95a4-ce76da25c4cd
|
diff --git a/wp-admin/js/tags-box.js b/wp-admin/js/tags-box.js
index 7535fbffd046..3867c7d6f0f8 100644
--- a/wp-admin/js/tags-box.js
+++ b/wp-admin/js/tags-box.js
@@ -92,7 +92,7 @@ var tagBox, array_unique_noempty;
*/
xbutton = $( '<button type="button" id="' + id + '-check-num-' + key + '" class="ntdelbutton">' +
'<span class="remove-tag-icon" aria-hidden="true"></span>' +
- '<span class="screen-reader-text">' + window.tagsSuggestL10n.removeTerm + ' ' + val + '</span>' +
+ '<span class="screen-reader-text">' + window.tagsSuggestL10n.removeTerm + ' ' + span.html() + '</span>' +
'</button>' );
xbutton.on( 'click keypress', function( e ) {
diff --git a/wp-admin/js/tags-box.min.js b/wp-admin/js/tags-box.min.js
index f66ec0264a30..ea9b6ea42fe9 100644
--- a/wp-admin/js/tags-box.min.js
+++ b/wp-admin/js/tags-box.min.js
@@ -1 +1 @@
-var tagBox,array_unique_noempty;!function(a){var b=window.tagsSuggestL10n&&window.tagsSuggestL10n.tagDelimiter||",";array_unique_noempty=function(b){var c=[];return a.each(b,function(b,d){d=a.trim(d),d&&a.inArray(d,c)===-1&&c.push(d)}),c},tagBox={clean:function(a){return","!==b&&(a=a.replace(new RegExp(b,"g"),",")),a=a.replace(/\s*,\s*/g,",").replace(/,+/g,",").replace(/[,\s]+$/,"").replace(/^[,\s]+/,""),","!==b&&(a=a.replace(/,/g,b)),a},parseTags:function(c){var d=c.id,e=d.split("-check-num-")[1],f=a(c).closest(".tagsdiv"),g=f.find(".the-tags"),h=g.val().split(b),i=[];return delete h[e],a.each(h,function(b,c){c=a.trim(c),c&&i.push(c)}),g.val(this.clean(i.join(b))),this.quickClicks(f),!1},quickClicks:function(c){var d,e,f=a(".the-tags",c),g=a(".tagchecklist",c),h=a(c).attr("id");f.length&&(e=f.prop("disabled"),d=f.val().split(b),g.empty(),a.each(d,function(b,c){var d,f;c=a.trim(c),c&&(d=a("<span />").text(c),e||(f=a('<button type="button" id="'+h+"-check-num-"+b+'" class="ntdelbutton"><span class="remove-tag-icon" aria-hidden="true"></span><span class="screen-reader-text">'+window.tagsSuggestL10n.removeTerm+" "+c+"</span></button>"),f.on("click keypress",function(b){"click"!==b.type&&13!==b.keyCode&&32!==b.keyCode||(13!==b.keyCode&&32!==b.keyCode||a(this).closest(".tagsdiv").find("input.newtag").focus(),tagBox.userAction="remove",tagBox.parseTags(this))}),d.prepend(" ").prepend(f)),g.append(d))}),tagBox.screenReadersMessage())},flushTags:function(c,d,e){var f,g,h,i=a(".the-tags",c),j=a("input.newtag",c);return d=d||!1,h=d?a(d).text():j.val(),"undefined"!=typeof h&&""!==h&&(f=i.val(),g=f?f+b+h:h,g=this.clean(g),g=array_unique_noempty(g.split(b)).join(b),i.val(g),this.quickClicks(c),d||j.val(""),"undefined"==typeof e&&j.focus(),!1)},get:function(b){var c=b.substr(b.indexOf("-")+1);a.post(ajaxurl,{action:"get-tagcloud",tax:c},function(d,e){0!==d&&"success"==e&&(d=a('<p id="tagcloud-'+c+'" class="the-tagcloud">'+d+"</p>"),a("a",d).click(function(){return tagBox.userAction="add",tagBox.flushTags(a("#"+c),this),!1}),a("#"+b).after(d))})},userAction:"",screenReadersMessage:function(){var a;switch(this.userAction){case"remove":a=window.tagsSuggestL10n.termRemoved;break;case"add":a=window.tagsSuggestL10n.termAdded;break;default:return}window.wp.a11y.speak(a,"assertive")},init:function(){var b=a("div.ajaxtag");a(".tagsdiv").each(function(){tagBox.quickClicks(this)}),a(".tagadd",b).click(function(){tagBox.userAction="add",tagBox.flushTags(a(this).closest(".tagsdiv"))}),a("input.newtag",b).keyup(function(b){13==b.which&&(tagBox.userAction="add",tagBox.flushTags(a(this).closest(".tagsdiv")),b.preventDefault(),b.stopPropagation())}).keypress(function(a){13==a.which&&(a.preventDefault(),a.stopPropagation())}).each(function(b,c){a(c).wpTagsSuggest()}),a("#post").submit(function(){a("div.tagsdiv").each(function(){tagBox.flushTags(this,!1,1)})}),a(".tagcloud-link").click(function(){tagBox.get(a(this).attr("id")),a(this).attr("aria-expanded","true").unbind().click(function(){a(this).attr("aria-expanded","false"===a(this).attr("aria-expanded")?"true":"false").siblings(".the-tagcloud").toggle()})})}}}(jQuery);
\ No newline at end of file
+var tagBox,array_unique_noempty;!function(a){var b=window.tagsSuggestL10n&&window.tagsSuggestL10n.tagDelimiter||",";array_unique_noempty=function(b){var c=[];return a.each(b,function(b,d){d=a.trim(d),d&&a.inArray(d,c)===-1&&c.push(d)}),c},tagBox={clean:function(a){return","!==b&&(a=a.replace(new RegExp(b,"g"),",")),a=a.replace(/\s*,\s*/g,",").replace(/,+/g,",").replace(/[,\s]+$/,"").replace(/^[,\s]+/,""),","!==b&&(a=a.replace(/,/g,b)),a},parseTags:function(c){var d=c.id,e=d.split("-check-num-")[1],f=a(c).closest(".tagsdiv"),g=f.find(".the-tags"),h=g.val().split(b),i=[];return delete h[e],a.each(h,function(b,c){c=a.trim(c),c&&i.push(c)}),g.val(this.clean(i.join(b))),this.quickClicks(f),!1},quickClicks:function(c){var d,e,f=a(".the-tags",c),g=a(".tagchecklist",c),h=a(c).attr("id");f.length&&(e=f.prop("disabled"),d=f.val().split(b),g.empty(),a.each(d,function(b,c){var d,f;c=a.trim(c),c&&(d=a("<span />").text(c),e||(f=a('<button type="button" id="'+h+"-check-num-"+b+'" class="ntdelbutton"><span class="remove-tag-icon" aria-hidden="true"></span><span class="screen-reader-text">'+window.tagsSuggestL10n.removeTerm+" "+d.html()+"</span></button>"),f.on("click keypress",function(b){"click"!==b.type&&13!==b.keyCode&&32!==b.keyCode||(13!==b.keyCode&&32!==b.keyCode||a(this).closest(".tagsdiv").find("input.newtag").focus(),tagBox.userAction="remove",tagBox.parseTags(this))}),d.prepend(" ").prepend(f)),g.append(d))}),tagBox.screenReadersMessage())},flushTags:function(c,d,e){var f,g,h,i=a(".the-tags",c),j=a("input.newtag",c);return d=d||!1,h=d?a(d).text():j.val(),"undefined"!=typeof h&&""!==h&&(f=i.val(),g=f?f+b+h:h,g=this.clean(g),g=array_unique_noempty(g.split(b)).join(b),i.val(g),this.quickClicks(c),d||j.val(""),"undefined"==typeof e&&j.focus(),!1)},get:function(b){var c=b.substr(b.indexOf("-")+1);a.post(ajaxurl,{action:"get-tagcloud",tax:c},function(d,e){0!==d&&"success"==e&&(d=a('<p id="tagcloud-'+c+'" class="the-tagcloud">'+d+"</p>"),a("a",d).click(function(){return tagBox.userAction="add",tagBox.flushTags(a("#"+c),this),!1}),a("#"+b).after(d))})},userAction:"",screenReadersMessage:function(){var a;switch(this.userAction){case"remove":a=window.tagsSuggestL10n.termRemoved;break;case"add":a=window.tagsSuggestL10n.termAdded;break;default:return}window.wp.a11y.speak(a,"assertive")},init:function(){var b=a("div.ajaxtag");a(".tagsdiv").each(function(){tagBox.quickClicks(this)}),a(".tagadd",b).click(function(){tagBox.userAction="add",tagBox.flushTags(a(this).closest(".tagsdiv"))}),a("input.newtag",b).keyup(function(b){13==b.which&&(tagBox.userAction="add",tagBox.flushTags(a(this).closest(".tagsdiv")),b.preventDefault(),b.stopPropagation())}).keypress(function(a){13==a.which&&(a.preventDefault(),a.stopPropagation())}).each(function(b,c){a(c).wpTagsSuggest()}),a("#post").submit(function(){a("div.tagsdiv").each(function(){tagBox.flushTags(this,!1,1)})}),a(".tagcloud-link").click(function(){tagBox.get(a(this).attr("id")),a(this).attr("aria-expanded","true").unbind().click(function(){a(this).attr("aria-expanded","false"===a(this).attr("aria-expanded")?"true":"false").siblings(".the-tagcloud").toggle()})})}}}(jQuery);
\ No newline at end of file
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9f9a17f942bb..56086c2a266e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
-$wp_version = '4.8-alpha-40169';
+$wp_version = '4.8-alpha-40181';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
| 1
|
0da8b8b801f9276359262f1ef8274c7812d3dfda?w=1
|
https://github.com/php/php-src/commit/0da8b8b801f9276359262f1ef8274c7812d3dfda?w=1
|
Fix bug #72135 - don't create strings with lengths outside int range
|
diff --git a/ext/standard/html.c b/ext/standard/html.c
index 72423b59f0e4d..81d8aff9e9adb 100644
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -163,7 +163,7 @@ static inline unsigned int get_next_char(
else
MB_FAILURE(pos, 4);
}
-
+
this_char = ((c & 0x07) << 18) | ((str[pos + 1] & 0x3f) << 12) | ((str[pos + 2] & 0x3f) << 6) | (str[pos + 3] & 0x3f);
if (this_char < 0x10000 || this_char > 0x10FFFF) { /* non-shortest form or outside range */
MB_FAILURE(pos, 4);
@@ -437,7 +437,7 @@ static enum entity_charset determine_charset(char *charset_hint TSRMLS_DC)
if (charset_hint) {
int found = 0;
-
+
/* now walk the charset map and look for the codeset */
for (i = 0; charset_map[i].codeset; i++) {
if (len == strlen(charset_map[i].codeset) && strncasecmp(charset_hint, charset_map[i].codeset, len) == 0) {
@@ -545,7 +545,7 @@ static inline unsigned char unimap_bsearch(const uni_to_enc *table, unsigned cod
return 0;
code_key = (unsigned short) code_key_a;
-
+
while (l <= h) {
m = l + (h - l) / 2;
if (code_key < m->un_code_point)
@@ -571,7 +571,7 @@ static inline int map_from_unicode(unsigned code, enum entity_charset charset, u
/* identity mapping of code points to unicode */
if (code > 0xFF) {
return FAILURE;
- }
+ }
*res = code;
break;
@@ -590,7 +590,7 @@ static inline int map_from_unicode(unsigned code, enum entity_charset charset, u
return FAILURE;
}
break;
-
+
case cs_8859_15:
if (code < 0xA4 || (code > 0xBE && code <= 0xFF)) {
*res = code;
@@ -634,7 +634,7 @@ static inline int map_from_unicode(unsigned code, enum entity_charset charset, u
case cs_cp866:
table = unimap_cp866;
table_size = sizeof(unimap_cp866) / sizeof(*unimap_cp866);
-
+
table_over_7F:
if (code <= 0x7F) {
*res = code;
@@ -710,7 +710,7 @@ static inline int unicode_cp_is_allowed(unsigned uni_cp, int document_type)
* Not sure this is the relevant part for HTML 5, though. I opted to
* disallow the characters that would result in a parse error when
* preprocessing of the input stream. See also section 8.1.3.
- *
+ *
* It's unclear if XHTML 1.0 allows C1 characters. I'll opt to apply to
* XHTML 1.0 the same rules as for XML 1.0.
* See <http://cmsmcq.com/2007/C1.xml>.
@@ -774,7 +774,7 @@ static inline int numeric_entity_is_allowed(unsigned uni_cp, int document_type)
/* {{{ process_numeric_entity
* Auxiliary function to traverse_for_entities.
* On input, *buf should point to the first character after # and on output, it's the last
- * byte read, no matter if there was success or insuccess.
+ * byte read, no matter if there was success or insuccess.
*/
static inline int process_numeric_entity(const char **buf, unsigned *code_point)
{
@@ -784,7 +784,7 @@ static inline int process_numeric_entity(const char **buf, unsigned *code_point)
if (hexadecimal && (**buf != '\0'))
(*buf)++;
-
+
/* strtol allows whitespace and other stuff in the beginning
* we're not interested */
if ((hexadecimal && !isxdigit(**buf)) ||
@@ -969,7 +969,7 @@ static void traverse_for_entities(
goto invalid_code;
/* are we allowed to decode this entity in this document type?
- * HTML 5 is the only that has a character that cannot be used in
+ * HTML 5 is the only that has a character that cannot be used in
* a numeric entity but is allowed literally (U+000D). The
* unoptimized version would be ... || !numeric_entity_is_allowed(code) */
if (!unicode_cp_is_allowed(code, doctype) ||
@@ -996,9 +996,9 @@ static void traverse_for_entities(
}
}
}
-
+
assert(*next == ';');
-
+
if (((code == '\'' && !(flags & ENT_HTML_QUOTE_SINGLE)) ||
(code == '"' && !(flags & ENT_HTML_QUOTE_DOUBLE)))
/* && code2 == '\0' always true for current maps */)
@@ -1026,7 +1026,7 @@ static void traverse_for_entities(
*(q++) = *p;
}
}
-
+
*q = '\0';
*retlen = (size_t)(q - ret);
}
@@ -1066,7 +1066,7 @@ static entity_table_opt determine_entity_table(int all, int doctype)
entity_table_opt retval = {NULL};
assert(!(doctype == ENT_HTML_DOC_XML1 && all));
-
+
if (all) {
retval.ms_table = (doctype == ENT_HTML_DOC_HTML5) ?
entity_ms_table_html5 : entity_ms_table_html4;
@@ -1111,13 +1111,13 @@ PHPAPI char *php_unescape_html_entities(unsigned char *old, size_t oldlen, size_
if (retlen == 0) {
goto empty_source;
}
-
+
inverse_map = unescape_inverse_map(all, flags);
-
+
/* replace numeric entities */
traverse_for_entities(old, oldlen, ret, &retlen, all, flags, inverse_map, charset);
-empty_source:
+empty_source:
*newlen = retlen;
return ret;
}
@@ -1141,7 +1141,7 @@ static inline void find_entity_for_char(
{
unsigned stage1_idx = ENT_STAGE1_INDEX(k);
const entity_stage3_row *c;
-
+
if (stage1_idx > 0x1D) {
*entity = NULL;
*entity_len = 0;
@@ -1162,7 +1162,7 @@ static inline void find_entity_for_char(
if (!(*cursor < oldlen))
goto no_suitable_2nd;
- next_char = get_next_char(charset, old, oldlen, cursor, &status);
+ next_char = get_next_char(charset, old, oldlen, cursor, &status);
if (status == FAILURE)
goto no_suitable_2nd;
@@ -1187,7 +1187,7 @@ static inline void find_entity_for_char(
*entity = (const unsigned char *)
c->data.multicodepoint_table[0].leading_entry.default_entity;
*entity_len = c->data.multicodepoint_table[0].leading_entry.default_entity_len;
- }
+ }
}
/* }}} */
@@ -1255,7 +1255,7 @@ PHPAPI char *php_escape_html_entities_ex(unsigned char *old, size_t oldlen, size
/* initial estimate */
if (oldlen < 64) {
- maxlen = 128;
+ maxlen = 128;
} else {
maxlen = 2 * oldlen;
if (maxlen < oldlen) {
@@ -1444,6 +1444,10 @@ static void php_html_entities(INTERNAL_FUNCTION_PARAMETERS, int all)
}
replaced = php_escape_html_entities_ex(str, str_len, &new_len, all, (int) flags, hint_charset, double_encode TSRMLS_CC);
+ if (new_len > INT_MAX) {
+ efree(replaced);
+ RETURN_FALSE;
+ }
RETVAL_STRINGL(replaced, (int)new_len, 0);
}
/* }}} */
@@ -1577,7 +1581,7 @@ static inline void write_s3row_data(
} else {
spe_cp = uni_cp;
}
-
+
written_k2 = write_octet_sequence(&key[written_k1], charset, spe_cp);
memcpy(&entity[1], mcpr[i].normal_entry.entity, l);
entity[l + 1] = ';';
@@ -1615,7 +1619,7 @@ PHP_FUNCTION(get_html_translation_table)
LIMIT_ALL(all, doctype, charset);
array_init(return_value);
-
+
entity_table = determine_entity_table(all, doctype);
if (all && !CHARSET_UNICODE_COMPAT(charset)) {
to_uni_table = enc_to_uni_index[charset];
| 1
|
881b5b03a590198d03008e4200dd00cc537712f3
|
https://github.com/PowerDNS/pdns/commit/881b5b03a590198d03008e4200dd00cc537712f3
|
Reject qname's wirelength > 255, `chopOff()` handle dot inside labels
|
diff --git a/pdns/dnsparser.cc b/pdns/dnsparser.cc
index c844f86327d..72761015094 100644
--- a/pdns/dnsparser.cc
+++ b/pdns/dnsparser.cc
@@ -402,8 +402,9 @@ uint8_t PacketReader::get8BitInt()
string PacketReader::getLabel(unsigned int recurs)
{
string ret;
+ size_t wirelength = 0;
ret.reserve(40);
- getLabelFromContent(d_content, d_pos, ret, recurs++);
+ getLabelFromContent(d_content, d_pos, ret, recurs++, wirelength);
return ret;
}
@@ -453,7 +454,7 @@ string PacketReader::getText(bool multi)
}
-void PacketReader::getLabelFromContent(const vector<uint8_t>& content, uint16_t& frompos, string& ret, int recurs)
+void PacketReader::getLabelFromContent(const vector<uint8_t>& content, uint16_t& frompos, string& ret, int recurs, size_t& wirelength)
{
if(recurs > 100) // the forward reference-check below should make this test 100% obsolete
throw MOADNSException("Loop");
@@ -462,6 +463,10 @@ void PacketReader::getLabelFromContent(const vector<uint8_t>& content, uint16_t&
// it is tempting to call reserve on ret, but it turns out it creates a malloc/free storm in the loop
for(;;) {
unsigned char labellen=content.at(frompos++);
+ wirelength++;
+ if (wirelength > 255) {
+ throw MOADNSException("Overly long DNS name ("+lexical_cast<string>(wirelength)+")");
+ }
if(!labellen) {
if(ret.empty())
@@ -474,13 +479,17 @@ void PacketReader::getLabelFromContent(const vector<uint8_t>& content, uint16_t&
if(offset >= pos)
throw MOADNSException("forward reference during label decompression");
- return getLabelFromContent(content, offset, ret, ++recurs);
+ /* the compression pointer does not count into the wire length */
+ return getLabelFromContent(content, offset, ret, ++recurs, --wirelength);
}
else if(labellen > 63)
throw MOADNSException("Overly long label during label decompression ("+lexical_cast<string>((unsigned int)labellen)+")");
else {
+ if (wirelength + labellen > 255) {
+ throw MOADNSException("Overly long DNS name ("+lexical_cast<string>(wirelength)+")");
+ }
+ wirelength += labellen;
// XXX FIXME THIS MIGHT BE VERY SLOW!
-
for(string::size_type n = 0 ; n < labellen; ++n, frompos++) {
if(content.at(frompos)=='.' || content.at(frompos)=='\\') {
ret.append(1, '\\');
diff --git a/pdns/dnsparser.hh b/pdns/dnsparser.hh
index 5fda67f2bae..60aab9ff0c6 100644
--- a/pdns/dnsparser.hh
+++ b/pdns/dnsparser.hh
@@ -133,7 +133,7 @@ public:
void xfrHexBlob(string& blob, bool keepReading=false);
static uint16_t get16BitInt(const vector<unsigned char>&content, uint16_t& pos);
- static void getLabelFromContent(const vector<uint8_t>& content, uint16_t& frompos, string& ret, int recurs);
+ static void getLabelFromContent(const vector<uint8_t>& content, uint16_t& frompos, string& ret, int recurs, size_t& wirelength);
void getDnsrecordheader(struct dnsrecordheader &ah);
void copyRecord(vector<unsigned char>& dest, uint16_t len);
diff --git a/pdns/misc.cc b/pdns/misc.cc
index 32d396bcf0e..9ad0d767289 100644
--- a/pdns/misc.cc
+++ b/pdns/misc.cc
@@ -150,16 +150,27 @@ bool chopOff(string &domain)
if(domain.empty())
return false;
- string::size_type fdot=domain.find('.');
-
- if(fdot==string::npos)
- domain="";
- else {
- string::size_type remain = domain.length() - (fdot + 1);
- char tmp[remain];
- memcpy(tmp, domain.c_str()+fdot+1, remain);
- domain.assign(tmp, remain); // don't dare to do this w/o tmp holder :-)
+ bool escaped = false;
+ const string::size_type domainLen = domain.length();
+ for (size_t fdot = 0; fdot < domainLen; fdot++)
+ {
+ if (domain[fdot] == '.' && !escaped) {
+ string::size_type remain = domainLen - (fdot + 1);
+ char tmp[remain];
+ memcpy(tmp, domain.c_str()+fdot+1, remain);
+ domain.assign(tmp, remain); // don't dare to do this w/o tmp holder :-)
+
+ return true;
+ }
+ else if (domain[fdot] == '\\' && !escaped) {
+ escaped = true;
+ }
+ else {
+ escaped = false;
+ }
}
+
+ domain = "";
return true;
}
@@ -169,19 +180,31 @@ bool chopOffDotted(string &domain)
if(domain.empty() || (domain.size()==1 && domain[0]=='.'))
return false;
- string::size_type fdot=domain.find('.');
- if(fdot == string::npos)
- return false;
-
- if(fdot==domain.size()-1)
- domain=".";
- else {
- string::size_type remain = domain.length() - (fdot + 1);
- char tmp[remain];
- memcpy(tmp, domain.c_str()+fdot+1, remain);
- domain.assign(tmp, remain);
+ bool escaped = false;
+ const string::size_type domainLen = domain.length();
+ for (size_t fdot = 0; fdot < domainLen; fdot++)
+ {
+ if (domain[fdot] == '.' && !escaped) {
+ if (fdot==domain.size()-1) {
+ domain=".";
+ }
+ else {
+ string::size_type remain = domainLen - (fdot + 1);
+ char tmp[remain];
+ memcpy(tmp, domain.c_str()+fdot+1, remain);
+ domain.assign(tmp, remain); // don't dare to do this w/o tmp holder :-)
+ }
+ return true;
+ }
+ else if (domain[fdot] == '\\' && !escaped) {
+ escaped = true;
+ }
+ else {
+ escaped = false;
+ }
}
- return true;
+
+ return false;
}
| 1
|
5f0542209c432c320371a337cf058b138d437357
|
https://github.com/linlinjava/litemall/commit/5f0542209c432c320371a337cf058b138d437357
|
build(deps): bump axios from 0.19.2 to 0.21.1 in /litemall-vue (#452)
Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.19.2...v0.21.1)
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
|
diff --git a/litemall-vue/package-lock.json b/litemall-vue/package-lock.json
index 3112e1cde..8fddb3c04 100644
--- a/litemall-vue/package-lock.json
+++ b/litemall-vue/package-lock.json
@@ -1895,11 +1895,18 @@
"dev": true
},
"axios": {
- "version": "0.19.2",
- "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
- "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
+ "version": "0.21.1",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+ "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
"requires": {
- "follow-redirects": "1.5.10"
+ "follow-redirects": "^1.10.0"
+ },
+ "dependencies": {
+ "follow-redirects": {
+ "version": "1.13.1",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz",
+ "integrity": "sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg=="
+ }
}
},
"babel-code-frame": {
@@ -3701,6 +3708,7 @@
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "dev": true,
"requires": {
"ms": "2.0.0"
}
@@ -5129,6 +5137,7 @@
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
"integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+ "dev": true,
"requires": {
"debug": "=3.1.0"
}
@@ -7155,7 +7164,8 @@
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+ "dev": true
},
"multicast-dns": {
"version": "6.2.3",
diff --git a/litemall-vue/package.json b/litemall-vue/package.json
index 5044d342e..af636e0e1 100644
--- a/litemall-vue/package.json
+++ b/litemall-vue/package.json
@@ -15,7 +15,7 @@
},
"dependencies": {
"@chenfengyuan/vue-countdown": "^1.1.2",
- "axios": ">=0.18.1",
+ "axios": ">=0.21.1",
"dayjs": "^1.7.7",
"js-cookie": "2.2.0",
"lodash": "^4.17.19",
| 0
|
ea553ad6e636778c1557a4f163ae74c0c91d4169
|
https://github.com/webmin/webmin/commit/ea553ad6e636778c1557a4f163ae74c0c91d4169
|
Add config option to stop caching user DB connections
|
diff --git a/acl/edit_sql.cgi b/acl/edit_sql.cgi
index 7005aa556b..d8060a0f94 100755
--- a/acl/edit_sql.cgi
+++ b/acl/edit_sql.cgi
@@ -96,6 +96,11 @@ print &ui_table_row(undef,
[ [ 0, $text{'sql_addto0'} ],
[ 1, $text{'sql_addto1'} ] ]), 2);
+print &ui_table_row(undef,
+ &ui_radio("nocache", int($miniserv{'userdb_nocache'} || 0),
+ [ [ 0, $text{'sql_nocache0'} ],
+ [ 1, $text{'sql_nocache1'} ] ]), 2);
+
print &ui_table_end();
print &ui_form_end([ [ undef, $text{'save'} ] ]);
diff --git a/acl/lang/en b/acl/lang/en
index 049b8ed95b..6a8b2dddff 100644
--- a/acl/lang/en
+++ b/acl/lang/en
@@ -444,6 +444,8 @@ sql_ldap=Use LDAP server
sql_prefix=Create under DN
sql_addto0=Add new users to database selected above
sql_addto1=Add new users to local files
+sql_nocache0=Cache connections to database
+sql_nocache1=Open a new connection for each lookup
sql_emod=Missing required Perl module <tt>$1</tt>
sql_etable=Failed to query required table $1 : $2
sql_eldapdn=Base LDAP DN $1 was not found
diff --git a/acl/save_sql.cgi b/acl/save_sql.cgi
index d8c6ad6c48..b4350bfce5 100755
--- a/acl/save_sql.cgi
+++ b/acl/save_sql.cgi
@@ -102,6 +102,7 @@ else {
&lock_file($ENV{'MINISERV_CONFIG'});
$miniserv{'userdb'} = $str;
$miniserv{'userdb_addto'} = $in{'addto'};
+ $miniserv{'userdb_nocache'} = $in{'nocache'};
&put_miniserv_config(\%miniserv);
&unlock_file($ENV{'MINISERV_CONFIG'});
&reload_miniserv();
diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index 924412c9be..d6ca48ccbe 100755
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -10769,7 +10769,9 @@ sub connect_userdb
{
my ($str) = @_;
my @rv;
-if ($main::connect_userdb_cache{$str}) {
+my %miniserv;
+&get_miniserv_config(\%miniserv);
+if (!$miniserv{'userdb_nocache'} && $main::connect_userdb_cache{$str}) {
@rv = @{$main::connect_userdb_cache{$str}};
$main::connect_userdb_cache_time{$str} = time();
return wantarray ? @rv : $rv[0];
@@ -10841,8 +10843,10 @@ sub connect_userdb
else {
return "Unknown protocol $proto";
}
-$main::connect_userdb_cache{$str} = \@rv;
-$main::connect_userdb_cache_time{$str} = time();
+if (!$miniserv{'userdb_nocache'}) {
+ $main::connect_userdb_cache{$str} = \@rv;
+ $main::connect_userdb_cache_time{$str} = time();
+ }
return wantarray ? @rv : $rv[0];
}
| 0
|
fc6080f1321fd21e86ef916195cc110b05d9effb
|
https://github.com/ImageMagick/ImageMagick/commit/fc6080f1321fd21e86ef916195cc110b05d9effb
|
Coder path traversal is not authorized, bug report provided by Masaaki Chida
|
diff --git a/ChangeLog b/ChangeLog
index 16b5853388..0a6aefdf34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-06-02 6.9.4-7 Cristy <quetzlzacatenango@image...>
+ * Fix small memory leak (patch provided by Андрей Черный).
+ * Coder path traversal is not authorized (bug report provided by
+ Masaaki Chida).
+
2016-05-31 6.9.4-6 Cristy <quetzlzacatenango@image...>
* Release ImageMagick version 6.9.4-6, GIT revision 18334:97775b5:20160531.
diff --git a/magick/module.c b/magick/module.c
index f8878b6352..a00b76d640 100644
--- a/magick/module.c
+++ b/magick/module.c
@@ -547,6 +547,15 @@ static MagickBooleanType GetMagickModulePath(const char *filename,
assert(path != (char *) NULL);
assert(exception != (ExceptionInfo *) NULL);
(void) CopyMagickString(path,filename,MaxTextExtent);
+#if defined(MAGICKCORE_INSTALLED_SUPPORT)
+ if (strstr(path,"../") != (char *) NULL)
+ {
+ errno=EPERM;
+ (void) ThrowMagickException(exception,GetMagickModule(),PolicyError,
+ "NotAuthorized","`%s'",path);
+ return(MagickFalse);
+ }
+#endif
module_path=(char *) NULL;
switch (module_type)
{
diff --git a/magick/xml-tree.c b/magick/xml-tree.c
index 3edca5db73..efe48065ed 100644
--- a/magick/xml-tree.c
+++ b/magick/xml-tree.c
@@ -2140,7 +2140,10 @@ MagickExport XMLTreeInfo *NewXMLTree(const char *xml,ExceptionInfo *exception)
if ((ignore_depth == 0) && (IsSkipTag(tag) == MagickFalse))
ParseOpenTag(root,tag,attributes);
else
- ignore_depth++;
+ {
+ ignore_depth++;
+ (void) DestroyXMLTreeAttributes(attributes);
+ }
*p=c;
}
else
| 1
|
f76275d4a91b28d687250525d3a0c5509bbd666f
|
https://github.com/uriparser/uriparser/commit/f76275d4a91b28d687250525d3a0c5509bbd666f
|
UriQuery.c: Catch integer overflow in ComposeQuery and ...Ex
|
diff --git a/ChangeLog b/ChangeLog
index 7c32d86..fae1ede 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
Thanks to Google Autofuzz team for the report!
* Fixed: Fix off-by-one in uriComposeQueryCharsRequired* and ...Ex*
Reported space requirements were 1 byte bigger than necessary
+ * Fixed: Detect integer overflow in uriComposeQuery* and uriComposeQueryEx*
+ Thanks to Google Autofuzz team for the report!
* TODO BUMP SONAME
2018-08-18 -- 0.8.6
diff --git a/src/UriQuery.c b/src/UriQuery.c
index 45acf5a..9165ec8 100644
--- a/src/UriQuery.c
+++ b/src/UriQuery.c
@@ -68,6 +68,10 @@
+#include <limits.h>
+
+
+
static int URI_FUNC(ComposeQueryEngine)(URI_CHAR * dest,
const URI_TYPE(QueryList) * queryList,
int maxChars, int * charsWritten, int * charsRequired,
@@ -201,9 +205,15 @@ int URI_FUNC(ComposeQueryEngine)(URI_CHAR * dest,
const URI_CHAR * const value = queryList->value;
const int worstCase = (normalizeBreaks == URI_TRUE ? 6 : 3);
const int keyLen = (key == NULL) ? 0 : (int)URI_STRLEN(key);
- const int keyRequiredChars = worstCase * keyLen;
+ int keyRequiredChars;
const int valueLen = (value == NULL) ? 0 : (int)URI_STRLEN(value);
- const int valueRequiredChars = worstCase * valueLen;
+ int valueRequiredChars;
+
+ if ((keyLen >= INT_MAX / worstCase) || (valueLen >= INT_MAX / worstCase)) {
+ return URI_ERROR_OUTPUT_TOO_LARGE;
+ }
+ keyRequiredChars = worstCase * keyLen;
+ valueRequiredChars = worstCase * valueLen;
if (dest == NULL) {
(*charsRequired) += ampersandLen + keyRequiredChars + ((value == NULL)
| 1
|
7aaddf52cd98589fb0c3ab72a393f8411838438a
|
https://github.com/ellson/graphviz/commit/7aaddf52cd98589fb0c3ab72a393f8411838438a
|
Fix buffer overflow problem when reporting a syntax error with a very long
input line
|
diff --git a/lib/cgraph/scan.l b/lib/cgraph/scan.l
index 3cfde0fdd..2efd203cc 100644
--- a/lib/cgraph/scan.l
+++ b/lib/cgraph/scan.l
@@ -16,6 +16,7 @@
%{
#include <grammar.h>
#include <cghdr.h>
+#include <agxbuf.h>
#include <ctype.h>
#define GRAPH_EOF_TOKEN '@' /* lex class must be defined below */
/* this is a workaround for linux flex */
@@ -191,13 +192,21 @@ ID ({NAME}|{NUMBER})
%%
void yyerror(char *str)
{
+ unsigned char xbuf[BUFSIZ];
char buf[BUFSIZ];
- if (InputFile)
- sprintf(buf,"%s:%d: %s in line %d near '%s'\n",InputFile, line_num,
- str,line_num,yytext);
- else
- sprintf(buf," %s in line %d near '%s'\n", str,line_num,yytext);
- agerr(AGWARN,buf);
+ agxbuf xb;
+
+ agxbinit(&xb, BUFSIZ, xbuf);
+ if (InputFile) {
+ agxbput (&xb, InputFile);
+ agxbput (&xb, ": ");
+ }
+ sprintf(buf," %s in line %d near '", str,line_num);
+ agxbput (&xb, buf);
+ agxbput (&xb, yytext);
+ agxbput (&xb,"'\n");
+ agerr(AGWARN,agxbuse(&xb));
+ agxbfree(&xb);
}
/* must be here to see flex's macro defns */
void aglexeof() { unput(GRAPH_EOF_TOKEN); }
| 1
|
1ef5bcc6b8c19d42d1e8056c404da63301480e96
|
https://github.com/markdown-it/markdown-it/commit/1ef5bcc6b8c19d42d1e8056c404da63301480e96
|
Bump entities 2.0.x => 2.1.x
|
diff --git a/package.json b/package.json
index 6632ab25..8f177062 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
],
"dependencies": {
"argparse": "^2.0.1",
- "entities": "~2.0.0",
+ "entities": "~2.1.0",
"linkify-it": "^3.0.1",
"mdurl": "^1.0.1",
"uc.micro": "^1.0.5"
| 0
|
117009adba9e1ece334cd2d51138c8558017b783
|
https://github.com/jhipster/generator-jhipster/commit/117009adba9e1ece334cd2d51138c8558017b783
|
Merge pull request #13817 from jhipster/dependabot/npm_and_yarn/generators/client/templates/react/postcss-loader-5.0.0
chore(deps-dev): bump postcss-loader from 4.2.0 to 5.0.0 in /generators/client/templates/react
|
diff --git a/generators/client/templates/react/package.json b/generators/client/templates/react/package.json
index 757670438e6..5efd154ecac 100644
--- a/generators/client/templates/react/package.json
+++ b/generators/client/templates/react/package.json
@@ -68,7 +68,7 @@
"merge-jsons-webpack-plugin": "1.0.21",
"mini-css-extract-plugin": "1.3.5",
"optimize-css-assets-webpack-plugin": "5.0.4",
- "postcss-loader": "4.2.0",
+ "postcss-loader": "5.0.0",
"prettier": "2.2.1",
"prettier-plugin-java": "1.0.1",
"react-infinite-scroller": "1.2.4",
| 0
|
c73fc43267596e4656a1bc4b2764f1b0e40a4ea9
|
https://github.com/arslancb/clipbucket/commit/c73fc43267596e4656a1bc4b2764f1b0e40a4ea9
|
modified : veriosn added
|
diff --git a/upload/package.json b/upload/package.json
index e69de29bb..4595e1275 100644
--- a/upload/package.json
+++ b/upload/package.json
@@ -0,0 +1,7 @@
+{
+ "name": "laravel/laravel",
+ "description": "The Laravel Framework.",
+ "keywords": ["framework", "laravel"],
+ "license": "MIT",
+ "type": "project",
+}
\ No newline at end of file
| 0
|
b4c681c770fa429734e45600906b4271421e1328
|
https://github.com/felixrieseberg/windows-build-tools/commit/b4c681c770fa429734e45600906b4271421e1328
|
5.2.2
|
diff --git a/package-lock.json b/package-lock.json
index ef2d2b8..15a8dd0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "windows-build-tools",
- "version": "5.2.1",
+ "version": "5.2.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 8a05815..0ef5939 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "windows-build-tools",
- "version": "5.2.1",
+ "version": "5.2.2",
"description": "Install C++ Build Tools for Windows using npm",
"main": "dist/index.js",
"scripts": {
| 0
|
30ac67579559fe42251b5a9f887211bf61a8ed68
|
https://github.com/WordPress/WordPress/commit/30ac67579559fe42251b5a9f887211bf61a8ed68
|
Fix for URL sanitization that can lead to cross-site scripting (XSS) attacks.
Props irsdl, sstoqnov, whyisjake.
Built from https://develop.svn.wordpress.org/trunk@45997
git-svn-id: http://core.svn.wordpress.org/trunk@45808 1a063a9b-81f0-0310-95a4-ce76da25c4cd
|
diff --git a/wp-includes/kses.php b/wp-includes/kses.php
index b707dca81392..797594937069 100644
--- a/wp-includes/kses.php
+++ b/wp-includes/kses.php
@@ -1664,6 +1664,7 @@ function wp_kses_html_error( $string ) {
* @return string Sanitized content.
*/
function wp_kses_bad_protocol_once( $string, $allowed_protocols, $count = 1 ) {
+ $string = preg_replace( '/(�*58(?![;0-9])|�*3a(?![;a-f0-9]))/i', '$1;', $string );
$string2 = preg_split( '/:|�*58;|�*3a;/i', $string, 2 );
if ( isset( $string2[1] ) && ! preg_match( '%/\?%', $string2[0] ) ) {
$string = trim( $string2[1] );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f0c3f56b0d91..b4e1f225caa9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
-$wp_version = '5.3-alpha-45990';
+$wp_version = '5.3-alpha-45997';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
| 1
|
d0688dcbdf412273e276dd29135b952f2065cb5b
|
https://github.com/bagder/curl/commit/d0688dcbdf412273e276dd29135b952f2065cb5b
|
socks: use the download buffer instead
The SOCKS code now uses the generic download buffer for temporary
storage during the connection procedure, instead of having its own
private 600 byte buffer that adds to the connectdata struct size. This
works fine because this point the buffer is allocated but is not use for
download yet since the connection hasn't completed.
This reduces the connection struct size by 22% on a 64bit arch!
The SOCKS buffer needs to be at least 600 bytes, and the download buffer
is guaranteed to never be smaller than 1000 bytes.
Closes #6491
|
diff --git a/lib/socks.c b/lib/socks.c
index 64b04dd6869c..9252e2c1741e 100644
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -195,7 +195,7 @@ CURLproxycode Curl_SOCKS4(const char *proxy_user,
struct connectdata *conn = data->conn;
const bool protocol4a =
(conn->socks_proxy.proxytype == CURLPROXY_SOCKS4A) ? TRUE : FALSE;
- unsigned char *socksreq = &conn->cnnct.socksreq[0];
+ unsigned char *socksreq = (unsigned char *)data->state.buffer;
CURLcode result;
curl_socket_t sockfd = conn->sock[sockindex];
struct connstate *sx = &conn->cnnct;
@@ -203,6 +203,9 @@ CURLproxycode Curl_SOCKS4(const char *proxy_user,
ssize_t actualread;
ssize_t written;
+ /* make sure that the buffer is at least 600 bytes */
+ DEBUGASSERT(READBUFFER_MIN >= 600);
+
if(!SOCKS_STATE(sx->state) && !*done)
sxstate(data, CONNECT_SOCKS_INIT);
@@ -319,7 +322,7 @@ CURLproxycode Curl_SOCKS4(const char *proxy_user,
socksreq[8] = 0; /* ensure empty userid is NUL-terminated */
if(proxy_user) {
size_t plen = strlen(proxy_user);
- if(plen >= sizeof(sx->socksreq) - 8) {
+ if(plen >= (size_t)data->set.buffer_size - 8) {
failf(data, "Too long SOCKS proxy user name, can't use!");
return CURLPX_LONG_USER;
}
@@ -438,8 +441,7 @@ CURLproxycode Curl_SOCKS4(const char *proxy_user,
failf(data,
"Can't complete SOCKS4 connection to %d.%d.%d.%d:%d. (%d)"
", request rejected or failed.",
- (unsigned char)socksreq[4], (unsigned char)socksreq[5],
- (unsigned char)socksreq[6], (unsigned char)socksreq[7],
+ socksreq[4], socksreq[5], socksreq[6], socksreq[7],
(((unsigned char)socksreq[2] << 8) | (unsigned char)socksreq[3]),
(unsigned char)socksreq[1]);
return CURLPX_REQUEST_FAILED;
@@ -448,8 +450,7 @@ CURLproxycode Curl_SOCKS4(const char *proxy_user,
"Can't complete SOCKS4 connection to %d.%d.%d.%d:%d. (%d)"
", request rejected because SOCKS server cannot connect to "
"identd on the client.",
- (unsigned char)socksreq[4], (unsigned char)socksreq[5],
- (unsigned char)socksreq[6], (unsigned char)socksreq[7],
+ socksreq[4], socksreq[5], socksreq[6], socksreq[7],
(((unsigned char)socksreq[2] << 8) | (unsigned char)socksreq[3]),
(unsigned char)socksreq[1]);
return CURLPX_IDENTD;
@@ -458,8 +459,7 @@ CURLproxycode Curl_SOCKS4(const char *proxy_user,
"Can't complete SOCKS4 connection to %d.%d.%d.%d:%d. (%d)"
", request rejected because the client program and identd "
"report different user-ids.",
- (unsigned char)socksreq[4], (unsigned char)socksreq[5],
- (unsigned char)socksreq[6], (unsigned char)socksreq[7],
+ socksreq[4], socksreq[5], socksreq[6], socksreq[7],
(((unsigned char)socksreq[2] << 8) | (unsigned char)socksreq[3]),
(unsigned char)socksreq[1]);
return CURLPX_IDENTD_DIFFER;
@@ -467,8 +467,7 @@ CURLproxycode Curl_SOCKS4(const char *proxy_user,
failf(data,
"Can't complete SOCKS4 connection to %d.%d.%d.%d:%d. (%d)"
", Unknown.",
- (unsigned char)socksreq[4], (unsigned char)socksreq[5],
- (unsigned char)socksreq[6], (unsigned char)socksreq[7],
+ socksreq[4], socksreq[5], socksreq[6], socksreq[7],
(((unsigned char)socksreq[2] << 8) | (unsigned char)socksreq[3]),
(unsigned char)socksreq[1]);
return CURLPX_UNKNOWN_FAIL;
@@ -507,7 +506,7 @@ CURLproxycode Curl_SOCKS5(const char *proxy_user,
o X'00' succeeded
*/
struct connectdata *conn = data->conn;
- unsigned char *socksreq = &conn->cnnct.socksreq[0];
+ unsigned char *socksreq = (unsigned char *)data->state.buffer;
char dest[256] = "unknown"; /* printable hostname:port */
int idx;
ssize_t actualread;
diff --git a/lib/url.h b/lib/url.h
index 6c71c1f75b79..ce4870ea602a 100644
--- a/lib/url.h
+++ b/lib/url.h
@@ -23,22 +23,6 @@
***************************************************************************/
#include "curl_setup.h"
-#define READBUFFER_SIZE CURL_MAX_WRITE_SIZE
-#define READBUFFER_MAX CURL_MAX_READ_SIZE
-#define READBUFFER_MIN 1024
-
-/* The default upload buffer size, should not be smaller than
- CURL_MAX_WRITE_SIZE, as it needs to hold a full buffer as could be sent in
- a write callback.
-
- The size was 16KB for many years but was bumped to 64KB because it makes
- libcurl able to do significantly faster uploads in some circumstances. Even
- larger buffers can help further, but this is deemed a fair memory/speed
- compromise. */
-#define UPLOADBUFFER_DEFAULT 65536
-#define UPLOADBUFFER_MAX (2*1024*1024)
-#define UPLOADBUFFER_MIN CURL_MAX_WRITE_SIZE
-
/*
* Prototypes for library-wide functions provided by url.c
*/
diff --git a/lib/urldata.h b/lib/urldata.h
index 1aa58507724b..0038e580aa1a 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -160,6 +160,22 @@ typedef CURLcode (*Curl_datastream)(struct Curl_easy *data,
#include <libssh2_sftp.h>
#endif /* HAVE_LIBSSH2_H */
+#define READBUFFER_SIZE CURL_MAX_WRITE_SIZE
+#define READBUFFER_MAX CURL_MAX_READ_SIZE
+#define READBUFFER_MIN 1024
+
+/* The default upload buffer size, should not be smaller than
+ CURL_MAX_WRITE_SIZE, as it needs to hold a full buffer as could be sent in
+ a write callback.
+
+ The size was 16KB for many years but was bumped to 64KB because it makes
+ libcurl able to do significantly faster uploads in some circumstances. Even
+ larger buffers can help further, but this is deemed a fair memory/speed
+ compromise. */
+#define UPLOADBUFFER_DEFAULT 65536
+#define UPLOADBUFFER_MAX (2*1024*1024)
+#define UPLOADBUFFER_MIN CURL_MAX_WRITE_SIZE
+
#define CURLEASY_MAGIC_NUMBER 0xc0dedbadU
#define GOOD_EASY_HANDLE(x) \
((x) && ((x)->magic == CURLEASY_MAGIC_NUMBER))
@@ -868,13 +884,9 @@ enum connect_t {
#define SOCKS_STATE(x) (((x) >= CONNECT_SOCKS_INIT) && \
((x) < CONNECT_DONE))
-#define SOCKS_REQUEST_BUFSIZE 600 /* room for large user/pw (255 max each) */
struct connstate {
enum connect_t state;
- unsigned char socksreq[SOCKS_REQUEST_BUFSIZE];
-
- /* CONNECT_SOCKS_SEND */
ssize_t outstanding; /* send this many bytes more */
unsigned char *outp; /* send from this pointer */
};
| 0
|
726812fa2fa7ce16bcf58f6e115f65427a1c0950
|
https://github.com/ImageMagick/ImageMagick/commit/726812fa2fa7ce16bcf58f6e115f65427a1c0950
|
Prevent buffer overflow in magick/draw.c
|
diff --git a/ChangeLog b/ChangeLog
index 1e88dc94cc..d2dfe6830a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-05-04 7.0.1-2 Cristy <quetzlzacatenango@image...>
+ * Check for buffer overflow in magick/draw.c/DrawStrokePolygon().
+
2016-05-03 7.0.1-1 Cristy <quetzlzacatenango@image...>
* New version 7.0.1-1, GIT revision 10723:9fc8a0c:20160503.
diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 547678410b..d9fe9e7f2d 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -1417,7 +1417,7 @@ MagickExport MagickBooleanType DrawClipPath(Image *image,
return(MagickFalse);
(void) QueryColorCompliance("#0000",AllCompliance,
&clip_mask->background_color,exception);
- clip_mask->background_color.alpha=(Quantum) TransparentAlpha;
+ clip_mask->background_color.alpha=(MagickRealType) TransparentAlpha;
(void) SetImageBackgroundColor(clip_mask,exception);
if (image->debug != MagickFalse)
(void) LogMagickEvent(DrawEvent,GetMagickModule(),"\nbegin clip-path %s",
@@ -1541,7 +1541,7 @@ static MagickBooleanType DrawDashPolygon(const DrawInfo *draw_info,
status=MagickTrue;
maximum_length=0.0;
total_length=0.0;
- for (i=1; (i < number_vertices) && (length >= 0.0); i++)
+ for (i=1; (i < (ssize_t) number_vertices) && (length >= 0.0); i++)
{
dx=primitive_info[i].point.x-primitive_info[i-1].point.x;
dy=primitive_info[i].point.y-primitive_info[i-1].point.y;
@@ -1794,7 +1794,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
/*
Interpret graphic primitive.
*/
- GetNextToken(q,&q,extent,keyword);
+ GetNextToken(q,&q,MagickPathExtent,keyword);
if (*keyword == '\0')
break;
if (*keyword == '#')
@@ -2104,7 +2104,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
GetNextToken(q,&q,extent,token);
weight=ParseCommandOption(MagickWeightOptions,MagickFalse,token);
if (weight == -1)
- weight=StringToUnsignedLong(token);
+ weight=(ssize_t) StringToUnsignedLong(token);
graphic_context[n]->weight=(size_t) weight;
break;
}
@@ -2353,7 +2353,8 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
(void) SetImageArtifact(image,key,token);
(void) FormatLocaleString(key,MagickPathExtent,"%s-type",name);
(void) SetImageArtifact(image,key,type);
- (void) FormatLocaleString(key,MagickPathExtent,"%s-geometry",name);
+ (void) FormatLocaleString(key,MagickPathExtent,"%s-geometry",
+ name);
(void) FormatLocaleString(geometry,MagickPathExtent,
"%gx%g%+.15g%+.15g",
MagickMax(fabs(bounds.x2-bounds.x1+1.0),1.0),
@@ -4608,7 +4609,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
*/
clone_info=CloneDrawInfo((ImageInfo *) NULL,draw_info);
clone_info->stroke_width=0.0;
- clone_info->stroke.alpha=(Quantum) TransparentAlpha;
+ clone_info->stroke.alpha=(MagickRealType) TransparentAlpha;
status&=DrawPolygonPrimitive(image,clone_info,primitive_info,
exception);
clone_info=DestroyDrawInfo(clone_info);
@@ -4643,7 +4644,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
}
clone_info=CloneDrawInfo((ImageInfo *) NULL,draw_info);
clone_info->stroke_width=0.0;
- clone_info->stroke.alpha=(Quantum) TransparentAlpha;
+ clone_info->stroke.alpha=(MagickRealType) TransparentAlpha;
status&=DrawPolygonPrimitive(image,clone_info,primitive_info,
exception);
clone_info=DestroyDrawInfo(clone_info);
@@ -4743,7 +4744,7 @@ static MagickBooleanType DrawStrokePolygon(Image *image,
if (clone_info->stroke_pattern != (Image *) NULL)
clone_info->fill_pattern=CloneImage(clone_info->stroke_pattern,0,0,
MagickTrue,exception);
- clone_info->stroke.alpha=(Quantum) TransparentAlpha;
+ clone_info->stroke.alpha=(MagickRealType) TransparentAlpha;
clone_info->stroke_width=0.0;
clone_info->fill_rule=NonZeroRule;
status=MagickTrue;
@@ -4858,7 +4859,7 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info)
draw_info->miterlimit=10;
draw_info->decorate=NoDecoration;
draw_info->pointsize=12.0;
- draw_info->undercolor.alpha=(Quantum) TransparentAlpha;
+ draw_info->undercolor.alpha=(MagickRealType) TransparentAlpha;
draw_info->compose=OverCompositeOp;
draw_info->render=MagickTrue;
draw_info->debug=IsEventLogging();
@@ -4925,7 +4926,7 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info)
weight=ParseCommandOption(MagickWeightOptions,MagickFalse,option);
if (weight == -1)
- weight=StringToUnsignedLong(option);
+ weight=(ssize_t) StringToUnsignedLong(option);
draw_info->weight=(size_t) weight;
}
exception=DestroyExceptionInfo(exception);
@@ -6021,17 +6022,29 @@ static PrimitiveInfo *TraceStrokePolygon(const DrawInfo *draw_info,
}
if (q >= (ssize_t) (max_strokes-6*BezierQuantum-360))
{
- max_strokes+=6*BezierQuantum+360;
- path_p=(PointInfo *) ResizeQuantumMemory(path_p,(size_t) max_strokes,
- sizeof(*path_p));
- path_q=(PointInfo *) ResizeQuantumMemory(path_q,(size_t) max_strokes,
- sizeof(*path_q));
- if ((path_p == (PointInfo *) NULL) || (path_q == (PointInfo *) NULL))
- {
- polygon_primitive=(PrimitiveInfo *)
- RelinquishMagickMemory(polygon_primitive);
- return((PrimitiveInfo *) NULL);
- }
+ if (~max_strokes < (6*BezierQuantum+360))
+ {
+ path_p=(PointInfo *) RelinquishMagickMemory(path_p);
+ path_q=(PointInfo *) RelinquishMagickMemory(path_q);
+ }
+ else
+ {
+ max_strokes+=6*BezierQuantum+360;
+ path_p=(PointInfo *) ResizeQuantumMemory(path_p,max_strokes,
+ sizeof(*path_p));
+ path_q=(PointInfo *) ResizeQuantumMemory(path_q,max_strokes,
+ sizeof(*path_q));
+ }
+ if ((path_p == (PointInfo *) NULL) || (path_q == (PointInfo *) NULL))
+ {
+ if (path_p != (PointInfo *) NULL)
+ path_p=(PointInfo *) RelinquishMagickMemory(path_p);
+ if (path_q != (PointInfo *) NULL)
+ path_q=(PointInfo *) RelinquishMagickMemory(path_q);
+ polygon_primitive=(PrimitiveInfo *)
+ RelinquishMagickMemory(polygon_primitive);
+ return((PrimitiveInfo *) NULL);
+ }
}
dot_product=dx.q*dy.p-dx.p*dy.q;
if (dot_product <= 0.0)
| 1
|
82102628f7935571b0c6f860e713358ec4a41ddd
|
https://github.com/osclass/OSClass/commit/82102628f7935571b0c6f860e713358ec4a41ddd
|
added missed links
|
diff --git a/oc-includes/osclass/install-functions.php b/oc-includes/osclass/install-functions.php
index 2cddafcd4..e83427109 100755
--- a/oc-includes/osclass/install-functions.php
+++ b/oc-includes/osclass/install-functions.php
@@ -832,7 +832,7 @@ function display_target() {
<td>
<input type="checkbox" id="createmarketaccount" name="createmarketaccount" value="1" /><label for="createmarketaccount"><?php _e('Create a Market.osclass.org account'); ?>
<img class="vtip" src="<?php echo get_absolute_url(); ?>oc-includes/images/question.png" title="<?php echo osc_esc_html(__("Create a market.osclass.org account and download free themes and plugins.")); ?>" alt="" />
- <br><?php _e("I accept Osclass SL’s Terms of Use and Cookies Policy and grant them permission to manage my data."); ?></label>
+ <br><?php _e("I accept Osclass SL’s <a href=\"https://osclass.org/page/legal-note\">Terms of Use</a> and <a href=\"https://osclass.org/page/cookies\">Cookies Policy and grant them permission to manage my data."); ?></label>
</td>
</tr>
</tbody>
| 0
|
2f7901c77ae57ecb97eac6c37aee1a34c4970845
|
https://github.com/apache/tomcat55/commit/2f7901c77ae57ecb97eac6c37aee1a34c4970845
|
Improve HTTP specification compliance
git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc5.5.x/trunk@1066318 13f79535-47bb-0310-9956-ffa450edef68
|
diff --git a/STATUS.txt b/STATUS.txt
index efe3eb28..3f4a4931 100644
--- a/STATUS.txt
+++ b/STATUS.txt
@@ -96,8 +96,3 @@ PATCHES PROPOSED TO BACKPORT:
2) do not change visibility of defaultProtocol, defaultKeystoreType
markt:
Happy to include those changes
-
-* Improve HTTP specification compliance
- http://svn.apache.org/viewvc?rev=1066244&view=rev
- +1: kkolinko, rjung, markt
- -1:
diff --git a/container/catalina/src/share/org/apache/catalina/connector/Request.java b/container/catalina/src/share/org/apache/catalina/connector/Request.java
index 454c9ff5..d11690f7 100644
--- a/container/catalina/src/share/org/apache/catalina/connector/Request.java
+++ b/container/catalina/src/share/org/apache/catalina/connector/Request.java
@@ -2588,7 +2588,12 @@ protected void parseLocalesHeader(String value) {
int semi = entry.indexOf(";q=");
if (semi >= 0) {
try {
- quality = Double.parseDouble(entry.substring(semi + 3));
+ String strQuality = entry.substring(semi + 3);
+ if (strQuality.length() <= 5) {
+ quality = Double.parseDouble(strQuality);
+ } else {
+ quality = 0.0;
+ }
} catch (NumberFormatException e) {
quality = 0.0;
}
diff --git a/container/webapps/docs/changelog.xml b/container/webapps/docs/changelog.xml
index 6a556f41..3d6c1b8c 100644
--- a/container/webapps/docs/changelog.xml
+++ b/container/webapps/docs/changelog.xml
@@ -47,8 +47,16 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Improve HTTP specification compliance in support of
+ <code>Accept-Language</code> header. (kkolinko)
+ </fix>
+ </changelog>
+ </subsection>
</section>
-<section name="Tomcat 5.5.32 (jim)" rtext="tagged 2011-01-22">
+<section name="Tomcat 5.5.32 (jim)" rtext="released 2011-02-01">
<subsection name="General">
<changelog>
<update>
| 1
|
235ef06386b1db51924105d521a82d9f08633fbc
|
https://github.com/firefly-iii/firefly-iii/commit/235ef06386b1db51924105d521a82d9f08633fbc
|
Merge pull request #4170 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/popperjs/core-2.6.0
Bump @popperjs/core from 2.5.4 to 2.6.0 in /frontend
|
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 1cd71b3f717..24df913b1de 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1041,9 +1041,9 @@
"dev": true
},
"@popperjs/core": {
- "version": "2.5.4",
- "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.5.4.tgz",
- "integrity": "sha512-ZpKr+WTb8zsajqgDkvCEWgp6d5eJT6Q63Ng2neTbzBO76Lbe91vX/iVIW9dikq+Fs3yEo+ls4cxeXABD2LtcbQ=="
+ "version": "2.6.0",
+ "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.6.0.tgz",
+ "integrity": "sha512-cPqjjzuFWNK3BSKLm0abspP0sp/IGOli4p5I5fKFAzdS8fvjdOwDCfZqAaIiXd9lPkOWi3SUUfZof3hEb7J/uw=="
},
"@types/chart.js": {
"version": "2.9.24",
diff --git a/frontend/package.json b/frontend/package.json
index f047d102c4f..2fb43ad4a62 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -25,7 +25,7 @@
},
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.1",
- "@popperjs/core": "^2.5.4",
+ "@popperjs/core": "^2.6.0",
"bootstrap": "^4.5.3",
"chart.js": "^2.9.4",
"icheck-bootstrap": "^3.0.1",
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 03be2f63ae8..ce743a38238 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -843,10 +843,10 @@
resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
-"@popperjs/core@^2.5.4":
- version "2.5.4"
- resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.5.4.tgz#de25b5da9f727985a3757fd59b5d028aba75841a"
- integrity sha512-ZpKr+WTb8zsajqgDkvCEWgp6d5eJT6Q63Ng2neTbzBO76Lbe91vX/iVIW9dikq+Fs3yEo+ls4cxeXABD2LtcbQ==
+"@popperjs/core@^2.6.0":
+ version "2.6.0"
+ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.6.0.tgz#f022195afdfc942e088ee2101285a1d31c7d727f"
+ integrity sha512-cPqjjzuFWNK3BSKLm0abspP0sp/IGOli4p5I5fKFAzdS8fvjdOwDCfZqAaIiXd9lPkOWi3SUUfZof3hEb7J/uw==
"@types/chart.js@^2.7.55":
version "2.9.28"
| 0
|
End of preview. Expand
in Data Studio
No dataset card yet
- Downloads last month
- 4