r23465: There was this diff between reg_printing in 3_0 and 3_0_26:

before writing to secdesc_buf->sd,
3_0 checked secdesc_buf->sd while 3_0_26 checked secdesc_buf->sd_size.

This patch makes both revisions check _both_ befor writing.

Jerry / Jeremy : please check if this is correct!

Michael

diff --git a/source/registry/reg_printing.c b/source/registry/reg_printing.c
index b9fe0b014ac37cc8f07cb6e6e480fac0d33c1c33..f33d0ab7555bdc9dc732c985be1574d894527509 100644 (file)
--- a/source/registry/reg_printing.c
+++ b/source/registry/reg_printing.c
@@ -449,7 +449,10 @@ static void fill_in_printer_values( NT_PRINTER_INFO_LEVEL_2 *info2, REGVAL_CTR *
                
        /* stream the printer security descriptor */
        
-       if ( info2->secdesc_buf && info2->secdesc_buf->sd )  {
+       if ( info2->secdesc_buf &&
+            info2->secdesc_buf->sd &&
+            info2->secdesc_buf->sd_size )  
+       {
                if ( sec_io_desc("sec_desc", &info2->secdesc_buf->sd, &prs, 0 ) ) {
                        offset = prs_offset( &prs );
                        regval_ctr_addvalue( values, "Security", REG_BINARY, prs_data_p(&prs), offset );