← Back to branch summary

~ubuntu-branches/ubuntu/raring/firebird2.5/raring-proposed

« back to all changes in this revision

Viewing changes to src/jrd/gds.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Damyan Ivanov
  • Date: 2011-09-24 14:12:19 UTC
  • mfrom: (15.1.8 sid)
  • Revision ID: james.westby@ubuntu.com-20110924141219-pkxk7486f3d8ut9f
Tags: 2.5.1.26349-0~rc1.ds4-5
http://bugs.debian.org/642555
* Medium urgency for fixing a serious bug in testing

* Import a patch from upstream SVN fixing problems in poll() usage when
  process receives signals like SIGALRM.
  Closes: #642555 -- segfault in the remote interface when using alarm() in
  the client program

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/jrd/gds.cpp
230
230
{
231
231
        return getDefaultMemoryPool()->allocate_nothrow(size_request
232
232
#ifdef DEBUG_GDS_ALLOC
233
 
                , filename, lineno
 
233
                , 0, filename, lineno
234
234
#endif
235
235
        );
236
236
}
2865
2865
                blr_format(control, "blr_default_code, ");
2866
2866
                break;
2867
2867
 
 
2868
        case blr_raise:
 
2869
                blr_format(control, "blr_raise, ");
 
2870
                break;
 
2871
 
2868
2872
        default:
2869
2873
                blr_error(control, "*** invalid condition type ***");
2870
2874
                break;
3611
3615
{
3612
3616
        return getDefaultMemoryPool()->allocate_nothrow(size_request
3613
3617
#ifdef DEBUG_GDS_ALLOC
3614
 
                , __FILE__, __LINE__
 
3618
                , 0, __FILE__, __LINE__
3615
3619
#endif
3616
3620
        );
3617
3621
}
3702
3706
                        FreeLibrary(hShFolder);
3703
3707
#else
3704
3708
                        char cmnData[MAXPATHLEN];
3705
 
                        if (!SHGetSpecialFolderPath(NULL, cmnData, CSIDL_COMMON_APPDATA, TRUE)) {
3706
 
                                Firebird::system_call_failed::raise("SHGetSpecialFolderPath");
3707
 
                        }
3708
 
                        PathUtils::concatPath(lockPrefix, cmnData, LOCKDIR);
 
3709
                        if (SHGetSpecialFolderPath(NULL, cmnData, CSIDL_COMMON_APPDATA, TRUE))
 
3710
                        {
 
3711
                                PathUtils::concatPath(lockPrefix, cmnData, LOCKDIR);
 
3712
                        }
 
3713
                        else
 
3714
                        {
 
3715
                                lockPrefix = prefix;    // emergency default
 
3716
                        }
3709
3717
#endif  // WIN9X_SUPPORT
3710
3718
#endif  // WIN_NT
3711
3719
                }