projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #5714 from alexischr/update_bockbuild
[mono.git]
/
mono
/
metadata
/
string-icalls.c
diff --git
a/mono/metadata/string-icalls.c
b/mono/metadata/string-icalls.c
index 773613c669283ddb99ca1bcc946a5754d544096f..e6cbc3dbfead9b35f8be5412e58b529d09bdeaa5 100644
(file)
--- a/
mono/metadata/string-icalls.c
+++ b/
mono/metadata/string-icalls.c
@@
-1,5
+1,6
@@
-/*
- * string-icalls.c: String internal calls for the corlib
+/**
+ * \file
+ * String internal calls for the corlib
*
* Author:
* Patrik Torstensson (patrik.torstensson@labs2.com)
*
* Author:
* Patrik Torstensson (patrik.torstensson@labs2.com)
@@
-7,6
+8,7
@@
*
* Copyright 2001-2003 Ximian, Inc (http://www.ximian.com)
* Copyright 2004-2009 Novell, Inc (http://www.novell.com)
*
* Copyright 2001-2003 Ximian, Inc (http://www.ximian.com)
* Copyright 2004-2009 Novell, Inc (http://www.novell.com)
+ * Licensed under the MIT license. See LICENSE file in the project root for full license information.
*/
#include <config.h>
#include <stdlib.h>
*/
#include <config.h>
#include <stdlib.h>
@@
-21,8
+23,6
@@
#include <mono/metadata/object.h>
#include <mono/metadata/exception.h>
#include <mono/metadata/debug-helpers.h>
#include <mono/metadata/object.h>
#include <mono/metadata/exception.h>
#include <mono/metadata/debug-helpers.h>
-#include <mono/metadata/profiler.h>
-#include <mono/metadata/profiler-private.h>
#include <mono/metadata/gc-internals.h>
/* This function is redirected to String.CreateString ()
#include <mono/metadata/gc-internals.h>
/* This function is redirected to String.CreateString ()
@@
-36,17
+36,22
@@
ves_icall_System_String_ctor_RedirectToCreateString (void)
MonoString *
ves_icall_System_String_InternalAllocateStr (gint32 length)
{
MonoString *
ves_icall_System_String_InternalAllocateStr (gint32 length)
{
- return mono_string_new_size(mono_domain_get (), length);
+ MonoError error;
+ MonoString *str = mono_string_new_size_checked (mono_domain_get (), length, &error);
+ mono_error_set_pending_exception (&error);
+
+ return str;
}
MonoString *
ves_icall_System_String_InternalIntern (MonoString *str)
{
}
MonoString *
ves_icall_System_String_InternalIntern (MonoString *str)
{
+ MonoError error;
MonoString *res;
MonoString *res;
- res = mono_string_intern
(st
r);
+ res = mono_string_intern
_checked (str, &erro
r);
if (!res) {
if (!res) {
- mono_
set_pending_exception (mono_domain_get ()->out_of_memory_ex
);
+ mono_
error_set_pending_exception (&error
);
return NULL;
}
return res;
return NULL;
}
return res;
@@
-55,7
+60,7
@@
ves_icall_System_String_InternalIntern (MonoString *str)
MonoString *
ves_icall_System_String_InternalIsInterned (MonoString *str)
{
MonoString *
ves_icall_System_String_InternalIsInterned (MonoString *str)
{
- return mono_string_is_interned(str);
+ return mono_string_is_interned
(str);
}
int
}
int