Attachment #11633 for bug #24801

View | Details | Raw Unified | Return to bug 24801
Collapse All | Expand All




#if APR_HAS_SHARED_MEMORY
    if (cache->rmm_addr) {
        /* allocate from shared memory */
        apr_rmm_off_t block = apr_rmm_calloc(cache->rmm_addr, size);
        return block ? (void *)apr_rmm_addr_get(cache->rmm_addr, block) : NULL;
    }
    else {
        /* Cache shm is not used */

#if APR_HAS_SHARED_MEMORY
    if (cache->rmm_addr) {
        /* allocate from shared memory */
        apr_rmm_off_t block = apr_rmm_calloc(cache->rmm_addr, strlen(s)+1);
        char *buf = block ? (char *)apr_rmm_addr_get(cache->rmm_addr, block) : NULL;
        if (buf) {
            strcpy(buf, s);
            return buf;

        return NULL;

#if APR_HAS_SHARED_MEMORY
    if (!st->cache_rmm) {
        return NULL;
    }
    else {
        apr_rmm_off_t block = apr_rmm_calloc(st->cache_rmm, sizeof(util_ald_cache_t));
        cache = block ? (util_ald_cache_t *)apr_rmm_addr_get(st->cache_rmm, block) : NULL;
    }
#else
    cache = (util_ald_cache_t *)calloc(sizeof(util_ald_cache_t), 1);
#endif

Return to bug 24801

Lines 99-105 Link Here

(-)util_ldap_cache_mgr.c (-4 / +10 lines)
99	#if APR_HAS_SHARED_MEMORY	99	#if APR_HAS_SHARED_MEMORY
100	if (cache->rmm_addr) {	100	if (cache->rmm_addr) {
101	/* allocate from shared memory */	101	/* allocate from shared memory */
102	return (void *)apr_rmm_addr_get(cache->rmm_addr, apr_rmm_calloc(cache->rmm_addr, size));	102	apr_rmm_off_t block = apr_rmm_calloc(cache->rmm_addr, size);
		103	return block ? (void *)apr_rmm_addr_get(cache->rmm_addr, block) : NULL;
103	}	104	}
104	else {	105	else {
105	/* Cache shm is not used */	106	/* Cache shm is not used */
Lines 115-121 Link Here
115	#if APR_HAS_SHARED_MEMORY	116	#if APR_HAS_SHARED_MEMORY
116	if (cache->rmm_addr) {	117	if (cache->rmm_addr) {
117	/* allocate from shared memory */	118	/* allocate from shared memory */
118	char buf = (char )apr_rmm_addr_get(cache->rmm_addr, apr_rmm_calloc(cache->rmm_addr, strlen(s)+1));	119	apr_rmm_off_t block = apr_rmm_calloc(cache->rmm_addr, strlen(s)+1);
		120	char buf = block ? (char )apr_rmm_addr_get(cache->rmm_addr, block) : NULL;
119	if (buf) {	121	if (buf) {
120	strcpy(buf, s);	122	strcpy(buf, s);
121	return buf;	123	return buf;
Lines 262-270 Link Here
262	return NULL;	264	return NULL;
263		265
264	#if APR_HAS_SHARED_MEMORY	266	#if APR_HAS_SHARED_MEMORY
265	if (!st->cache_rmm)	267	if (!st->cache_rmm) {
266	return NULL;	268	return NULL;
267	cache = (util_ald_cache_t *)apr_rmm_addr_get(st->cache_rmm, apr_rmm_calloc(st->cache_rmm, sizeof(util_ald_cache_t)));	269	}
		270	else {
		271	apr_rmm_off_t block = apr_rmm_calloc(st->cache_rmm, sizeof(util_ald_cache_t));
		272	cache = block ? (util_ald_cache_t *)apr_rmm_addr_get(st->cache_rmm, block) : NULL;
		273	}
268	#else	274	#else
269	cache = (util_ald_cache_t *)calloc(sizeof(util_ald_cache_t), 1);	275	cache = (util_ald_cache_t *)calloc(sizeof(util_ald_cache_t), 1);
270	#endif	276	#endif