From 853b4488c056230afa0f59c68415502045b37d93 Mon Sep 17 00:00:00 2001 From: Thomas Schmidts Date: Wed, 25 Jun 2014 09:17:39 +0200 Subject: [PATCH 1/2] Small Fixes for API function design --- Documentation/Books/bot.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/Books/bot.py b/Documentation/Books/bot.py index df8f0a140c..34b0a72d49 100644 --- a/Documentation/Books/bot.py +++ b/Documentation/Books/bot.py @@ -40,14 +40,15 @@ def replaceText(text, pathOfFile, searchText): # HTTP API changing code replaced = replaced.replace("@brief","") - replaced = re.sub(r"@RESTHEADER{([\s\w\/-]*),([\s\w]*)}", r"###\g<2>\n `\g<1>", replaced) + replaced = re.sub(r"@RESTHEADER{([\s\w\/\_-]*),([\s\w]*)}", r"###\g<2>\n `\g<1>`", replaced) replaced = replaced.replace("@RESTDESCRIPTION","") replaced = replaced.replace("@RESTURLPARAMS","*URL Parameters*\n") replaced = replaced.replace("@RESTQUERYPARAMS","*Query Parameters*\n") replaced = replaced.replace("@RESTHEADERPARAMS","*Header Parameters*\n") replaced = replaced.replace("@RESTBODYPARAMS","*Body Parameters*\n") replaced = replaced.replace("@RESTRETURNCODES","*Return Codes*") - replaced = re.sub(r"@RESTPARAM{([\s\w]*),([\s\w]*),\s*(\w+)}", r"* *\g<1>* (\g<3>):", replaced) + replaced = re.sub(r"@RESTPARAM{([\s\w\-]*),([\s\w\_\|-]*),\s[optional]}", r"* *\g<1>* (\g<3>):", replaced) + replaced = re.sub(r"@RESTPARAM{([\s\w-]*),([\s\w\_\|-]*),\s*(\w+)}", r"* *\g<1>*:", replaced) # replaced = re.sub(r"@RESTPARAM{(\s*\w+\-*\w+),(\s*\w+),\s*(\w+)}", r"* *\g<1>* (\g<3>):", replaced) replaced = re.sub(r"@RESTRETURNCODE{(.*)}", r"* *HTTP \g<1>*:", replaced) replaced = re.sub(r"@RESTBODYPARAMS{(.*)}", r"*(\g<1>)*", replaced) From 2aec336f09777834309ce133c4efd4c0bfbcb956 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Wed, 25 Jun 2014 09:38:20 +0200 Subject: [PATCH 2/2] fixed bufferoverflow --- 3rdParty/icu/source/tools/pkgdata/pkgdata.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdParty/icu/source/tools/pkgdata/pkgdata.cpp b/3rdParty/icu/source/tools/pkgdata/pkgdata.cpp index a7626336b5..6cea4d904c 100644 --- a/3rdParty/icu/source/tools/pkgdata/pkgdata.cpp +++ b/3rdParty/icu/source/tools/pkgdata/pkgdata.cpp @@ -1975,7 +1975,7 @@ static void loadLists(UPKGOptions *o, UErrorCode *status) FILE *p = NULL; size_t n; static char buf[512] = ""; - char cmdBuf[1024]; + char cmdBuf[1025]; UErrorCode status = U_ZERO_ERROR; const char cmd[] = "icu-config --incpkgdatafile";