diff options
| author | mbr <mbr@FreeBSD.org> | 2002-08-10 18:57:27 +0800 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2002-08-10 18:57:27 +0800 |
| commit | 29aeece8ffe910a44e29b542a866cde9c26593f7 (patch) | |
| tree | aee26860ee3e13dd286490106aa95a1d21e80238 | |
| parent | d91f8ddfd7f71c3d23682751cf1a5b37bb42107c (diff) | |
| download | freebsd-ports-gnome-29aeece8ffe910a44e29b542a866cde9c26593f7.tar.gz freebsd-ports-gnome-29aeece8ffe910a44e29b542a866cde9c26593f7.tar.zst freebsd-ports-gnome-29aeece8ffe910a44e29b542a866cde9c26593f7.zip | |
Check in two cases if a string is NULL. Fixes WITH_DEBUG=
installation.
23 files changed, 506 insertions, 0 deletions
diff --git a/editors/openoffice-1.0/files/patch-tools+source+string+tstring.cxx b/editors/openoffice-1.0/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice-1.0/files/patch-tools::source::string::tstring.cxx b/editors/openoffice-1.0/files/patch-tools::source::string::tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-tools::source::string::tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice-1.1-devel/files/patch-tools+source+string+tstring.cxx b/editors/openoffice-1.1-devel/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice-1.1/files/patch-tools+source+string+tstring.cxx b/editors/openoffice-1.1/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice-1.1/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice-2.0-devel/files/patch-tools+source+string+tstring.cxx b/editors/openoffice-2.0-devel/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice-3-devel/files/patch-tools+source+string+tstring.cxx b/editors/openoffice-3-devel/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice-3/files/patch-tools+source+string+tstring.cxx b/editors/openoffice-3/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice-3/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice-devel/files/patch-tools+source+string+tstring.cxx b/editors/openoffice-devel/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice-devel/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice.org-1.0/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-1.0/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice.org-1.0/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice.org-1.0/files/patch-tools::source::string::tstring.cxx b/editors/openoffice.org-1.0/files/patch-tools::source::string::tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice.org-1.0/files/patch-tools::source::string::tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice.org-1.1-devel/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-1.1-devel/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice.org-1.1/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-1.1/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice.org-2-RC/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-2-RC/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice.org-2-devel/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-2-devel/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice.org-2.0-devel/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-2.0-devel/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice.org-2.0/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-2.0/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice.org-2/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-2/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice.org-3-RC/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-3-RC/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice.org-3-devel/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-3-devel/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice.org-3/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-3/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice.org-vcltesttool/files/patch-tools+source+string+tstring.cxx b/editors/openoffice.org-vcltesttool/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice/files/patch-tools+source+string+tstring.cxx b/editors/openoffice/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice/files/patch-tools::source::string::tstring.cxx b/editors/openoffice/files/patch-tools::source::string::tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice/files/patch-tools::source::string::tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); |