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);
}}}

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

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...

Thank you, Mark!!

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

5538bac..622be8b master -> master
commit 622be8bfbc942fe100b8880df72db26e99e1c954
Author: Mark Reynolds mreynolds@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 99dbfb7601daea80f80d1ea9d29766d76555e01a

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

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

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 82b4347bf7f8b29bd5e3e7734daa4aaa465fa57c

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-base is moving from Pagure to Github. This means that new issues and pull requests
will be accepted only in 389-ds-base's github repository.

This issue has been cloned to Github and is available here:
- https://github.com/389ds/389-ds-base/issues/1615

If you want to receive further updates on the issue, please navigate to the github issue
and click on subscribe button.

Thank you for understanding. We apologize for all inconvenience.