free target entry when add operation fails

[389-ds-bot]

Cloned from Pagure issue: https://pagure.io/389-ds-base/issue/48284

• Created at 2015-09-22 22:26:53 by mreynolds (@mreynolds389)
• Closed as Fixed
• Assigned to mreynolds (@mreynolds389)
• Associated bugzillas
  • https://bugzilla.redhat.com/show_bug.cgi?id=1259949
  • https://bugzilla.redhat.com/show_bug.cgi?id=1259383

---

There are cases where the target entry for ADD is not freed when certain internal errors occur. The entry is supposed to be consumed, so it should always be freed before returning to the caller.

[389-ds-bot]

Comment from nhosoi (@nhosoi) at 2015-09-22 23:21:09

Looks good to me. One small request. Might be a bit too paranoiac, but could you add something like "slapi_pblock_set(pb, SLAPI_ADD_ENTRY, NULL)" at the line 323 to make sure the entry never be available? Thanks!!

 	319	                /* free the entry as it's expected to be consumed */ 
 	320	                Slapi_Entry *e; 
 	321	                slapi_pblock_get (pb, SLAPI_ADD_ENTRY, &e); 
 	322	                slapi_entry_free(e);

[389-ds-bot]

Comment from mreynolds (@mreynolds389) at 2015-09-22 23:41:42

revision
0001-Ticket-48284-free-entry-when-internal-add-fails.patch

[389-ds-bot]

Comment from mreynolds (@mreynolds389) at 2015-09-22 23:41:59

Replying to [comment:2 nhosoi]:

Looks good to me. One small request. Might be a bit too paranoiac, but could you add something like "slapi_pblock_set(pb, SLAPI_ADD_ENTRY, NULL)" at the line 323 to make sure the entry never be available? Thanks!!

 	319	                /* free the entry as it's expected to be consumed */ 
 	320	                Slapi_Entry *e; 
 	321	                slapi_pblock_get (pb, SLAPI_ADD_ENTRY, &e); 
 	322	                slapi_entry_free(e);

New patch attached...

[389-ds-bot]

Comment from nhosoi (@nhosoi) at 2015-09-22 23:51:25

Thank you, Mark!!

Since this ticket is related to 48266, we should push this fix to 1.2.11.x, as well?

[389-ds-bot]

Comment from mreynolds (@mreynolds389) at 2015-09-22 23:56:11

5538bac..622be8b master -> master
commit 622be8b
Author: Mark Reynolds mreynolds389@redhat.com
Date: Tue Sep 22 13:41:06 2015 -0400

1c127b4..99dbfb7 389-ds-base-1.3.4 -> 389-ds-base-1.3.4
commit 99dbfb7

c28b52f..61f3a05 389-ds-base-1.3.3 -> 389-ds-base-1.3.3
commit 61f3a05

318f897..8449e3b 389-ds-base-1.3.2 -> 389-ds-base-1.3.2
commit 8449e3b

e861b06..4eb33f3 389-ds-base-1.3.1 -> 389-ds-base-1.3.1
commit 4eb33f330c5f29c701c78faba5720f610f871c2a

3896e68..82b4347 389-ds-base-1.2.11 -> 389-ds-base-1.2.11
commit 82b4347

[389-ds-bot]

Comment from mreynolds (@mreynolds389) at 2015-09-22 23:56:44

Replying to [comment:5 nhosoi]:

Thank you, Mark!!

Since this ticket is related to 48266, we should push this fix to 1.2.11.x, as well?

Yeah it needs to be in 1.2.11 for 48266 (sorry already pushed it)

[389-ds-bot]

Comment from mreynolds (@mreynolds389) at 2017-02-11 23:09:33

Metadata Update from @mreynolds389:

• Issue assigned to mreynolds389
• Issue set to the milestone: 1.2.11.33