Opened 5 years ago

Closed 5 years ago

Last modified 5 years ago

#13460 closed defect (fixed)

fix error handling mistake in patch for Bug 13028

Reported by: arthuredelstein Owned by:
Priority: Medium Milestone:
Component: Applications/Tor Browser Version:
Severity: Keywords: MikePerry201410R, tbb-4.5-alpha
Cc: Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

Visual Studio compiler discovered a problem in patch for Bug 13028 (https://gitweb.torproject.org/tor-browser.git/blobdiff/777695d09e3cff4c79c48839e1c9d5102b772d6f..04c046e11f6622f44ca010bcb8ecf68cf470a4c0:/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c)

In both cases, return PR_FAILURE; should be PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED);

Fixup attached.

Child Tickets

Attachments (1)

0001-fixup-Bug-13028-Use-indigenous-error-handling-fixes-.patch (1.4 KB) - added by arthuredelstein 5 years ago.

Download all attachments as: .zip

Change History (5)

comment:1 Changed 5 years ago by arthuredelstein

Component: - Select a componentTor Browser
Keywords: MikePerry201410R added
Status: newneeds_review

comment:2 Changed 5 years ago by mikeperry

Keywords: tbb-4.5-alpha added

comment:3 Changed 5 years ago by mikeperry

Resolution: fixed
Status: needs_reviewclosed

Couple points:

  1. In one of those two cases, I used the return because the normal error handling had a free for a strdup. We need to move the block above the strdup if we want to use it.
  2. Your fixup commits need to have the full commit summary line that they are fixing, otherwise git won't autosquash them together when we rebase.

I've fixed both of these issues and pushed this commit: https://gitweb.torproject.org/tor-browser.git/commitdiff/6cb68a4ec0990509273a939c2034c20aa26ff69d.

comment:4 in reply to:  3 Changed 5 years ago by arthuredelstein

Replying to mikeperry:

Couple points:

  1. In one of those two cases, I used the return because the normal error handling had a free for a strdup. We need to move the block above the strdup if we want to use it.
  2. Your fixup commits need to have the full commit summary line that they are fixing, otherwise git won't autosquash them together when we rebase.

Both good points -- thanks.

Note: See TracTickets for help on using tickets.