Re: CVS: commit dom abi/src/wp/impexp/xp ie_imp_MsWord_97.cpp

Please forward-port to HEAD.

Thanks,
Dom

--- cvs@abisource.com wrote:

>
> Update of /cvsroot/abi/src/wp/impexp/xp
> In directory
> abiword.snt.utwente.nl:/tmp/cvs-serv20659
>
> Modified Files:
> Tag: ABI-2-4-0-STABLE
> ie_imp_MsWord_97.cpp
> Log Message:
> bug 10122 - abiword crashes because of a null
> bookmark
>
> Index: ie_imp_MsWord_97.cpp
>
===================================================================
> RCS file:
> /cvsroot/abi/src/wp/impexp/xp/ie_imp_MsWord_97.cpp,v
> retrieving revision 1.336.2.6
> retrieving revision 1.336.2.7
> diff -u -d -r1.336.2.6 -r1.336.2.7
> --- ie_imp_MsWord_97.cpp 26 Oct 2005 23:57:47 -0000
> 1.336.2.6
> +++ ie_imp_MsWord_97.cpp 15 Mar 2006 13:20:09 -0000
> 1.336.2.7
> @@ -1297,12 +1297,15 @@
> {
> // 16 bit stuff
> const UT_UCS2Char * p = static_cast<const
> UT_UCS2Char *>(ps->Sttbfbkmk.u16strings[pos]);
> - UT_uint32 len = UT_UCS2_strlen(static_cast<const
> UT_UCS2Char*>(ps->Sttbfbkmk.u16strings[pos]));
> - sUTF8.clear();
> - sUTF8.appendUCS2(p, len);
> -
> - str = new XML_Char[sUTF8.byteLength()+1];
> - strcpy(str, sUTF8.utf8_str());
> + if(p) {
> + UT_uint32 len = UT_UCS2_strlen(p);
> + sUTF8.clear();
> + sUTF8.appendUCS2(p, len);
> +
> + str = new XML_Char[sUTF8.byteLength()+1];
> + strcpy(str, sUTF8.utf8_str());
> + } else
> + str = NULL;
> }
> else
> {
>
> -----------------------------------------------
> To unsubscribe from this list, send a message to
> abisource-cvs-commit-request@abisource.com with the
> word
> unsubscribe in the message body.
>

__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com
Received on Wed Mar 15 14:22:58 2006