summaryrefslogtreecommitdiffstats
path: root/editors/openoffice.org-2
diff options
context:
space:
mode:
authormbr <mbr@FreeBSD.org>2002-08-10 10:57:27 +0000
committermbr <mbr@FreeBSD.org>2002-08-10 10:57:27 +0000
commit29aeece8ffe910a44e29b542a866cde9c26593f7 (patch)
treeaee26860ee3e13dd286490106aa95a1d21e80238 /editors/openoffice.org-2
parentd91f8ddfd7f71c3d23682751cf1a5b37bb42107c (diff)
downloadFreeBSD-ports-29aeece8ffe910a44e29b542a866cde9c26593f7.zip
FreeBSD-ports-29aeece8ffe910a44e29b542a866cde9c26593f7.tar.gz
Check in two cases if a string is NULL. Fixes WITH_DEBUG=
installation.
Diffstat (limited to 'editors/openoffice.org-2')
-rw-r--r--editors/openoffice.org-2/files/patch-tools+source+string+tstring.cxx22
1 files changed, 22 insertions, 0 deletions
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 0000000..12bd6bd
--- /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);
OpenPOWER on IntegriCloud