mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-29 14:40:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix Issue 11338

Browse source 
- Now call the onOutOfMemoryError() function when alloca returns NULL
- Fixed the URIexception name to URIException
- Added a string constructor for the URIException class
- Added more informative messages to some of the errors
This commit is contained in:
DannyArends 2013-10-24 14:30:56 +02:00
parent 1fd19c2366
commit fa0627b218
1 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

48
std/uri.d
View file

@ -34,13 +34,19 @@ debug(uri) private import std.stdio;
private import std.ascii; private import std.ascii;
private import std.c.stdlib; private import std.c.stdlib;
private import std.utf; private import std.utf;
import std.exception; import core.exception : onOutOfMemoryError;
import std.exception : assumeUnique;
class URIexception : Exception class URIException : Exception
{ {
this() @safe pure nothrow this()
{ {
super("URI error"); super("URI Exception");
}
@safe pure nothrow this(string msg)
{
super("URI Exception: " ~ msg);
} }
} }
@ -116,7 +122,7 @@ private string URI_Encode(dstring string, uint unescapedSet)
{ {
R2 = cast(char *)alloca(Rsize * char.sizeof); R2 = cast(char *)alloca(Rsize * char.sizeof);
if (!R2) if (!R2)
goto LthrowURIexception; onOutOfMemoryError();
} }
R2[0..Rlen] = R[0..Rlen]; R2[0..Rlen] = R[0..Rlen];
R = R2; R = R2;
@ -181,7 +187,7 @@ private string URI_Encode(dstring string, uint unescapedSet)
+/ +/
else else
{ {
goto LthrowURIexception; // undefined UTF-32 code throw new URIException("Undefined UTF-32 code");
} }
if (Rlen + L * 3 > Rsize) if (Rlen + L * 3 > Rsize)
@ -196,7 +202,7 @@ private string URI_Encode(dstring string, uint unescapedSet)
{ {
R2 = cast(char *)alloca(Rsize * char.sizeof); R2 = cast(char *)alloca(Rsize * char.sizeof);
if (!R2) if (!R2)
goto LthrowURIexception; onOutOfMemoryError();
} }
R2[0..Rlen] = R[0..Rlen]; R2[0..Rlen] = R[0..Rlen];
R = R2; R = R2;
@ -214,9 +220,6 @@ private string URI_Encode(dstring string, uint unescapedSet)
} }
return R[0..Rlen].idup; return R[0..Rlen].idup;
LthrowURIexception:
throw new URIexception();
} }
uint ascii2hex(dchar c) uint ascii2hex(dchar c)
@ -249,7 +252,7 @@ private dstring URI_Decode(string string, uint reservedSet)
{ {
R = cast(dchar *)alloca(Rsize * dchar.sizeof); R = cast(dchar *)alloca(Rsize * dchar.sizeof);
if (!R) if (!R)
goto LthrowURIexception; onOutOfMemoryError();
} }
Rlen = 0; Rlen = 0;
@ -267,9 +270,9 @@ private dstring URI_Decode(string string, uint reservedSet)
} }
start = k; start = k;
if (k + 2 >= len) if (k + 2 >= len)
goto LthrowURIexception; throw new URIException("URI terminated unexpectedly");
if (!isHexDigit(s[k + 1]) || !isHexDigit(s[k + 2])) if (!isHexDigit(s[k + 1]) || !isHexDigit(s[k + 2]))
goto LthrowURIexception; throw new URIException("Expected a HexDigit after '%'");
B = cast(char)((ascii2hex(s[k + 1]) << 4) + ascii2hex(s[k + 2])); B = cast(char)((ascii2hex(s[k + 1]) << 4) + ascii2hex(s[k + 2]));
k += 2; k += 2;
if ((B & 0x80) == 0) if ((B & 0x80) == 0)
@ -283,11 +286,11 @@ private dstring URI_Decode(string string, uint reservedSet)
for (n = 1; ; n++) for (n = 1; ; n++)
{ {
if (n > 4) if (n > 4)
goto LthrowURIexception; goto LthrowURIException;
if (((B << n) & 0x80) == 0) if (((B << n) & 0x80) == 0)
{ {
if (n == 1) if (n == 1)
goto LthrowURIexception; goto LthrowURIException;
break; break;
} }
} }
@ -296,22 +299,22 @@ private dstring URI_Decode(string string, uint reservedSet)
V = B & ((1 << (7 - n)) - 1); // (!!!) V = B & ((1 << (7 - n)) - 1); // (!!!)
if (k + (3 * (n - 1)) >= len) if (k + (3 * (n - 1)) >= len)
goto LthrowURIexception; goto LthrowURIException;
for (j = 1; j != n; j++) for (j = 1; j != n; j++)
{ {
k++; k++;
if (s[k] != '%') if (s[k] != '%')
goto LthrowURIexception; throw new URIException("Expected: '%'");
if (!isHexDigit(s[k + 1]) || !isHexDigit(s[k + 2])) if (!isHexDigit(s[k + 1]) || !isHexDigit(s[k + 2]))
goto LthrowURIexception; throw new URIException("Expected a HexDigit after '%'");
B = cast(char)((ascii2hex(s[k + 1]) << 4) + ascii2hex(s[k + 2])); B = cast(char)((ascii2hex(s[k + 1]) << 4) + ascii2hex(s[k + 2]));
if ((B & 0xC0) != 0x80) if ((B & 0xC0) != 0x80)
goto LthrowURIexception; goto LthrowURIException;
k += 2; k += 2;
V = (V << 6) | (B & 0x3F); V = (V << 6) | (B & 0x3F);
} }
if (V > 0x10FFFF) if (V > 0x10FFFF)
goto LthrowURIexception; goto LthrowURIException;
C = V; C = V;
} }
if (C < uri_flags.length && uri_flags[C] & reservedSet) if (C < uri_flags.length && uri_flags[C] & reservedSet)
@ -333,9 +336,8 @@ private dstring URI_Decode(string string, uint reservedSet)
// Copy array on stack to array in memory // Copy array on stack to array in memory
return R[0..Rlen].idup; return R[0..Rlen].idup;
LthrowURIException:
LthrowURIexception: throw new URIException();
throw new URIexception();
} }
/************************************* /*************************************