* Fix string literal with URL + LLcommand();
* Added 'detected around: value' when a x.Y detect occurs to help debug. * Fixed object text is too long to store to the database (wikilith)0.6.0-stable
parent
d7ec686691
commit
83bd85ce7f
|
@ -270,7 +270,14 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
|
|
||||||
public string Text
|
public string Text
|
||||||
{
|
{
|
||||||
get { return m_rootPart.Text; }
|
get {
|
||||||
|
string returnstr = m_rootPart.Text;
|
||||||
|
if (returnstr.Length > 255)
|
||||||
|
{
|
||||||
|
returnstr = returnstr.Substring(0, 255);
|
||||||
|
}
|
||||||
|
return returnstr;
|
||||||
|
}
|
||||||
set { m_rootPart.Text = value; }
|
set { m_rootPart.Text = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -585,7 +585,15 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
|
|
||||||
public string Text
|
public string Text
|
||||||
{
|
{
|
||||||
get { return m_text; }
|
get
|
||||||
|
{
|
||||||
|
string returnstr = m_text;
|
||||||
|
if (returnstr.Length > 255)
|
||||||
|
{
|
||||||
|
returnstr = returnstr.Substring(0, 254);
|
||||||
|
}
|
||||||
|
return returnstr;
|
||||||
|
}
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
m_text = value;
|
m_text = value;
|
||||||
|
|
|
@ -42,7 +42,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
|
||||||
// c Style
|
// c Style
|
||||||
private Regex cstylecomments = new Regex(@"/\*(.|[\r\n])*?\*/", RegexOptions.Compiled | RegexOptions.Multiline);
|
private Regex cstylecomments = new Regex(@"/\*(.|[\r\n])*?\*/", RegexOptions.Compiled | RegexOptions.Multiline);
|
||||||
// c# one liners
|
// c# one liners
|
||||||
private Regex nonCommentFwsl = new Regex("\"[a-zA-Z0-9.,:/ ]+//[^\"]+(" + @"[\\" + "\"]+)?[\"](\\s+)?;", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
|
private Regex nonCommentFwsl = new Regex("\"[a-zA-Z0-9.,:/\\n ]+//[^\"+]+([\\\\\\\"+]+)?(\\s+)?[\"+](\\s+)?(;)?", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
|
||||||
private Regex conelinecomments = new Regex(@"[^:].?([\/]{2}[^\n]*)|([\n]{1,}[\/]{2}[^\n]*)", RegexOptions.Compiled | RegexOptions.Multiline);
|
private Regex conelinecomments = new Regex(@"[^:].?([\/]{2}[^\n]*)|([\n]{1,}[\/]{2}[^\n]*)", RegexOptions.Compiled | RegexOptions.Multiline);
|
||||||
// ([^\"])((?:[a-zA-Z])\.[a-zA-Z].?)([^\"])
|
// ([^\"])((?:[a-zA-Z])\.[a-zA-Z].?)([^\"])
|
||||||
|
|
||||||
|
@ -121,10 +121,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
|
||||||
// ignores alpha.x alpha.y, alpha.z for refering to vector components
|
// ignores alpha.x alpha.y, alpha.z for refering to vector components
|
||||||
Match SecurityM;
|
Match SecurityM;
|
||||||
|
|
||||||
// BROKEN: this check is very wrong. It block's any url in strings.
|
|
||||||
SecurityM = Regex.Match(checkscript, @"(?:[a-zA-Z])\.(?:[a-wA-Z]|[a-zA-Z][a-zA-Z])", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
|
SecurityM = Regex.Match(checkscript, @"([a-zA-Z])\.(?:[a-wA-Z]|[a-zA-Z][a-zA-Z])", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
|
||||||
if (SecurityM.Success)
|
if (SecurityM.Success)
|
||||||
throw new Exception("CS0103: 'The . symbol cannot be used in LSL except in float values or vector components'");
|
throw new Exception("CS0103: 'The . symbol cannot be used in LSL except in float values or vector components'. Detected around: " + SecurityM.Captures[0].Value);
|
||||||
|
|
||||||
SecurityM = Regex.Match(checkscript, @"typeof\s", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
|
SecurityM = Regex.Match(checkscript, @"typeof\s", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
|
||||||
if (SecurityM.Success)
|
if (SecurityM.Success)
|
||||||
|
|
Loading…
Reference in New Issue