← Back to branch summary

~ubuntu-branches/ubuntu/natty/virtualbox-ose/natty-updates

« back to all changes in this revision

Viewing changes to src/VBox/Runtime/r3/posix/utf8-posix.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-10-15 02:12:28 UTC
  • mfrom: (0.3.10 upstream) (0.4.19 sid)
  • Revision ID: james.westby@ubuntu.com-20101015021228-5e6vbxgtes8mg189
Tags: 3.2.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - VirtualBox should go in Accessories, not in System tools.
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add ubuntu-01-fix-build-gcc45.patch to fix FTBFS due to uninitalized
  variables. Thanks to Lubomir Rintel <lkundrak@v3.sk> for the patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Runtime/r3/posix/utf8-posix.cpp
371
371
    if (hSelf != NIL_RTTHREAD)
372
372
    {
373
373
        PRTTHREADINT pThread = rtThreadGet(hSelf);
374
 
        if (   pThread
375
 
            && (pThread->fIntFlags & (RTTHREADINT_FLAGS_ALIEN | RTTHREADINT_FLAGS_MAIN)) != RTTHREADINT_FLAGS_ALIEN)
376
 
            return rtstrConvertCached(pchInput, cchInput, pszInputCS,
377
 
                                      (void **)ppszOutput, cbOutput, pszOutputCS,
378
 
                                      cFactor, (iconv_t *)&pThread->ahIconvs[enmCacheIdx]);
 
374
        if (pThread)
 
375
        {
 
376
            if ((pThread->fIntFlags & (RTTHREADINT_FLAGS_ALIEN | RTTHREADINT_FLAGS_MAIN)) != RTTHREADINT_FLAGS_ALIEN)
 
377
            {
 
378
                int rc = rtstrConvertCached(pchInput, cchInput, pszInputCS,
 
379
                                            (void **)ppszOutput, cbOutput, pszOutputCS,
 
380
                                            cFactor, (iconv_t *)&pThread->ahIconvs[enmCacheIdx]);
 
381
                rtThreadRelease(pThread);
 
382
                return rc;
 
383
            }
 
384
            rtThreadRelease(pThread);
 
385
        }
379
386
    }
380
387
#endif
381
388
    return rtStrConvertUncached(pchInput, cchInput, pszInputCS,